Winter castles, extent.area
Added the Reading Room, a room with 2 corner bookshelves
Merge remote-tracking branch 'jimfinnis/master'
Merge
Merge remote-tracking branch 'jimfinnis/master'

Conflicts:
	Gorm/src/org/pale/gorm/Building.java
	Gorm/src/org/pale/gorm/Noise.java
Describing Rooms, also hoping to fix github pullrequest derps
Fixed Merge issues and conflicts
Merge pull request #3 from Domos123/master

Added new decorative room and winter castle type