Version Stable Monitor sans ppo
Merge branch 'master' of https://github.com/Vice-Pre/Zappy into Vice-Pre-master

Conflicts:
	Makefile
	Serveur/serveur.c
Merge branch 'Vice-Pre-master', yes again, but this time it's realy stable
Corrected merge conflict on previous merge with Vice-Pre
Oups, I forgot some files on previous commit