Merge branch 'master' of https://github.com/jcossette/ProjetReseauChat into develop

Conflicts:
	src/Client.java