test
Merge branch 'master' of http://github.com/tthomas25/projet_src
fix lien
Merge branch 'master' of http://github.com/tthomas25/projet_src

Conflicts:
	page2.html