modifs 16h55 10/07
Merge branch 'master' of https://github.com/NTCParkour/www

Conflicts:
	js/main.js