merde
Merge branch 'master' of https://github.com/tthomas25/projet_src
 grosse merde
Merge branch 'master' of https://github.com/tthomas25/projet_src

Conflicts:
	css/style.css
	page2.html