lights
Merge branch 'Bishopmap' of https://github.com/cremalab/holidays-game into Bishopmap

Conflicts:
	app/lib/landscape.coffee
avatars, bathroom, text