cable foo
Merge branch 'master' of github.com:openspaceaarhus/phaser-entry
more cable fiddling
Merge branch 'master' of github.com:openspaceaarhus/phaser-entry

Conflicts:
	src/Player.ts
some cable stuff that is off
Merge branch 'master' of github.com:openspaceaarhus/phaser-entry

Conflicts:
	src/PlayState.ts
	src/Player.ts