Merge pull request #24 from ExperienceOrb/master

Make everything the same
Added things
Merge pull request #26 from ExperienceOrb/Kyle's-Branch

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

Fix for david