Cmd Client--> Serveur
Merge branch 'master' of https://github.com/Vice-Pre/Zappy into Vice-Pre-master

Conflicts:
	Serveur/serveur.c
Merged again Vice-Pre's repo
Merge branch 'Vice-Pre-master'