Modif 1
Merge branch 'master' of github.com:MehdiLhommeau/TP_GIT

Conflicts:
	README.md

Modif 2
Merge pull request #5 from benj3773/master

Modif Roulette.P & Guilleux.B