Commit Xavier
Merge README
Merge branch 'master' of https://github.com/Fulbok/Projet-jeu-temps

Conflicts:
	README.md