Merge pull request #25 from ExperienceOrb/master

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

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

Fix for david
Merge pull request #28 from ExperienceOrb/Kyle's-Branch

David fix this
Merge pull request #29 from ExperienceOrb/master

David fix this
New treez
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 #32 from ExperienceOrb/master

Merge master with Kyle's Branch