Deuxieme commit Joseph LE ajout
Merge branch 'master' of https://github.com/benel/TP-Git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/benel/TP-Git

Conflicts:
	README.md
Merge pull request #42 from AlexisBrandao/master

Ajout de J. Le.
conflit