New House
Merge remote-tracking branch 'cataclysm2a/master'
New House
Locked Door fix
House Name Fix

Oops
Another minor map error
2 New Gun Stores
Gun Store fix
small_hw_whales Roof fix

(Used nothing instead of empty, was throwing up errors!)
Minor changes
Merge pull request #28 from Aninimouse/master

2 Houses, 2 Gun Stores, and minor fix