Merge pull request #21 from ExperienceOrb/David's-Branch

Merge pull request #20 from ExperienceOrb/master
Merge pull request #22 from ExperienceOrb/David's-Branch

House
Started Adding Areas
Merge pull request #23 from ExperienceOrb/Kyle's-Branch

Started Adding Areas
Merge pull request #25 from ExperienceOrb/master

Ma