modifcation
Merge branch 'master' of git@github.com:bamine1983/mincom.git

Conflicts:
	client.php
	serveur.php