diff --git a/.gitignore b/.gitignore
index 5042a9c..4afe7ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,10 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+/cpp/wiipair/.settings
+/cpp/wiipair/Release/src
+=======
 /java/bin
+>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
+=======
+/cpp/wiiuse/Debug/src
+>>>>>>> develop-wiiuse
diff --git a/cpp/mimis/wiiuse.dll b/cpp/mimis/wiiuse.dll
new file mode 100644
index 0000000..8272fcc
Binary files /dev/null and b/cpp/mimis/wiiuse.dll differ
diff --git a/cpp/wiipair/Release/wiipair.exe b/cpp/wiipair/Release/wiipair.exe
index 2442cc2..3991a44 100644
Binary files a/cpp/wiipair/Release/wiipair.exe and b/cpp/wiipair/Release/wiipair.exe differ
diff --git a/cpp/wiiscan/lib/wiiuse.lib b/cpp/wiiscan/lib/wiiuse.lib
new file mode 100644
index 0000000..c510043
Binary files /dev/null and b/cpp/wiiscan/lib/wiiuse.lib differ
diff --git a/cpp/wiiuse/Debug/wiiuse.dll b/cpp/wiiuse/Debug/wiiuse.dll
new file mode 100644
index 0000000..8272fcc
Binary files /dev/null and b/cpp/wiiuse/Debug/wiiuse.dll differ
diff --git a/cpp/wiiuse/Debug/wiiuse.lib b/cpp/wiiuse/Debug/wiiuse.lib
new file mode 100644
index 0000000..c510043
Binary files /dev/null and b/cpp/wiiuse/Debug/wiiuse.lib differ
diff --git a/vendor/commons-collections/commons-collections-3.2.1.jar b/vendor/commons-collections/commons-collections-3.2.1.jar
new file mode 100644
index 0000000..c35fa1f
Binary files /dev/null and b/vendor/commons-collections/commons-collections-3.2.1.jar differ