diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..18430ed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+<<<<<<< HEAD
+/cpp/wiipair/.settings
+/cpp/wiipair/Release/src
+=======
+/java/bin
+>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
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/java/client.jar b/java/client.jar
index 38a8e8b..15b5e21 100644
Binary files a/java/client.jar and b/java/client.jar differ
diff --git a/java/main.jar b/java/main.jar
index c99b430..d6166a0 100644
Binary files a/java/main.jar and b/java/main.jar differ