version dupuymazur
Merge branch 'master' of github.com:MehdiLhommeau/TP_GIT

Conflicts:
	README.md
version dupuymazur
Merge branch 'master' of github.com:MehdiLhommeau/TP_GIT
modifi dupuymazur
Conflicts:
	README.md
blabla
Merge pull request #19 from dupuymazur/master

dupuy mazur