something
Merge branch 'master' of github.com:cremalab/holidays-game

Conflicts:
	app/models/player.coffee
ghosty boolean on obstructions if non-collidable
Merge pull request #21 from cremalab/non-collision-obstructions

Non-collision obstructions