Ajout Alan
Merge branch 'master' of https://github.com/gaultier/projet_pierre

Conflicts:
	README.md
Merge branch 'master' of https://github.com/gaultier/projet_pierre

Conflicts:
	README.md