modification édito
Merge branch 'master' of https://github.com/WallartSylvainA2/TP3 into TP3_1

Conflicts:
	index.html
Merge pull request #9 from antoinerodaro/TP3_1

modification édito