Merge
Merge branch 'master' of https://github.com/hysst/cofp1.git
Try to do server close clean; merge with nico
Merge branch 'master' of https://github.com/hysst/cofp1.git

Conflicts:
	TCPClient/src/ihm/TCPClientIHM.java
	TCPServer/src/connexion/Server.java