Alexendre & Jaouen & Robin
Merge branch 'master' of github.com:MehdiLhommeau/TP_GIT

Conflicts:
	README.md
Merge pull request #10 from Xelarende/master

TpGit