Controls for player.
Merge remote-tracking branch 'origin'

Conflicts:
	js/game.js
	js/main.js