Merge pull request #12 from ExperienceOrb/Kyle's-Branch

Kyle's branch
Merge pull request #13 from ExperienceOrb/master

Merge master with David's Branch
Merge pull request #14 from ExperienceOrb/David's-Branch

Merge pull request #13 from ExperienceOrb/master
Merge pull request #15 from ExperienceOrb/Kyle's-Branch

Kyle's branch
Merge pull request #16 from ExperienceOrb/Kyle's-Branch

Houses
Merge pull request #17 from ExperienceOrb/master

Merge master with David's Branch
Merge pull request #18 from ExperienceOrb/David's-Branch

Merge pull request #17 from ExperienceOrb/master
Merge pull request #19 from ExperienceOrb/Kyle's-Branch

Reverted to more stable build
Merge pull request #20 from ExperienceOrb/master

Trying to fix david
Merge pull request #21 from ExperienceOrb/David's-Branch

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

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

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

Make everything the same