commit README.md
commit2 README
Merge branch 'master' of github.com:MehdiLhommeau/TP_GIT

Conflicts:
	README.md
Merge pull request #14 from nycomenard/master

Nicolas Menard & Aurelien Adam