Page "notre eau magique"
Merge branch 'master' of https://github.com/jonathanpath/Aquakid-prototype

Conflicts:
	css/main.css
	index.html