modif client
Merge origin/Boys into Boys

Conflicts:
	ServeurSurnom/src/client/Client.java
	ServeurSurnom/src/client/ClientLauncher.java
	ServeurSurnom/src/protocole/ExitCommand.java
Merge origin/Boys into Boys

Conflicts:
	ServeurSurnom/src/client/Client.java
	ServeurSurnom/src/client/ClientLauncher.java
	ServeurSurnom/src/protocole/ExitCommand.java
Merge origin/Boys into Boys

Conflicts:
	ServeurSurnom/src/client/Client.java
	ServeurSurnom/src/client/ClientLauncher.java
	ServeurSurnom/src/protocole/ExitCommand.java