Set player properties
Set player properties
Basic collision and sandbox scenario implemented
Merge remote-tracking branch 'origin/dangerous'

Conflicts:
	game/game.js