something
progress
spin up new room if current one full
comment
adding elipsis to room number before return
Merge pull request #20 from cremalab/room-provisioning

Room provisioning
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
Merge branch 'master' into Bishopmap

Conflicts:
	app/lib/landscape.coffee
making macs non-collidable