wait for merge
Merge branch 'master' of https://github.com/hysst/cofp1.git
merging with camus
Merge branch 'master' of https://github.com/hysst/cofp1.git

Conflicts:
	TCPClient/src/ihm/TCPClientIHM.java