MatchMaking
a
a
merge
asd
merge
ass
MERGE !
FUCK
Merge branch 'master' of
https://github.com/gibtmirdas/batailleNavale.git

Conflicts:
	ClientBNP/.classpath
	ClientBNP/src/GUIManager/GUIManager.java
	ClientBNP/src/connection/ClientConnection.java
	ClientBNP/src/window/ConnectWindow.java
	ServerBNP/bin/.gitignore
	ServerBNP/bin/Connection.class
	ServerBNP/bin/Launch.class
	ServerBNP/src/Launch.java