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

Conflicts:
	TCPClient/src/connexion/Connexion.java
Merge branch 'master' of https://github.com/hysst/cofp1.git