fixed bug getting in the void + camera
Merge branch 'master' of https://github.com/GHoning/DeLawei

Conflicts:
	js/entities/Player.js
	js/screens/play.js