Added Entity class

Loading building bug
Merge pull request #30 from ExperienceOrb/Kyle's-Branch

Added Entity class
Merge pull request #31 from ExperienceOrb/David's-Branch

David's branch
Merge pull request #33 from ExperienceOrb/master

Merge master with David's Branch