Mise à jour
Merge branch 'master' of https://github.com/benel/TP-Git

Conflicts:
	README.md
Merge pull request #28 from Jacquemet/master

Ajout de N. Isaac & T. Jacquemet