Fix player movement
Merge branch 'master' of https://github.com/christopherwebb/off-a-bridge

Conflicts:
	js/main.js
zog