Changements differents que celles de Marine
Merge branch 'master' of https://github.com/jonasoesch/SplashyPants

Conflicts:
	test.html