merge
Merge branch 'master' of https://github.com/hysst/cofp1.git

Conflicts:
	TCPServer/src/ihm/TCPServerIHM.java