Merge branch 'master' of https://github.com/valentinbaes/TP2
Merge branch 'master' of https://github.com/valentinbaes/TP2
Merge branch 'master' of https://github.com/valentinbaes/TP2
changement edito
sans fautes
ajustement taille photo de l'article parkour
Merge branch 'master' of https://github.com/valentinbaes/TP2
Merge pull request #10 from CressonQuentinB1/master

quentin article parkour
Merge pull request #11 from auroreparismmi1b2/master

modification edito automobile
Merge pull request #12 from ClairetThibautMMI1B1/master

Sans fautes
Merge branch 'master' of https://github.com/valentinbaes/TP2

Conflicts:
	index.html