* src/Player.ts: kdsj
Merge branch 'master' of github.com:openspaceaarhus/phaser-entry

Conflicts:
	src/Player.ts