modifying
caca
Merge branch 'master' of https://github.com/gibtmirdas/batailleNavale

Conflicts:
	ClientBNP/src/GUIManager/GUIManager.java
	ClientBNP/src/connection/ClientConnection.java
	ClientBNP/src/window/LauncherShopCardList.java