Merge remote-tracking branch 'origin/master'

Conflicts:
	js/Game.js
	player1.php

Working movement and collision checking