Update php
Merge branch 'master' of https://github.com/NTCParkour/www

Conflicts:
	js/home.js