Added 4 bookshelves, 7 tables
Items

Added couches
Merge branch 'master' into Bishopmap
Merge branch 'avatar-adjustments' into Bishopmap
fixing pan boundaries
items

added office table, sharpie tables, chairs
More items and chairs
more items
Merge branch 'master' into Bishopmap

Conflicts:
	app/lib/landscape.coffee
making macs non-collidable
Merge branch 'master' of github.com:cremalab/holidays-game into Bishopmap
Merge branch 'master' into Bishopmap
Merge branch 'master' into Bishopmap

Conflicts:
	app/controllers/game_controller.coffee
more items, bathroom
Merge pull request #22 from cremalab/Bishopmap

Bishop's interior Map