Page contact
Merge branch 'master' of https://github.com/jonathanpath/Aquakid-prototype

Conflicts:
	css/main.css