reset
Merge branch 'master' of https://github.com/moonpeth/r-seaux

Conflicts:
	ObjetReseau/src/serveur/Handmessage.java
merge ok