Revert "developmentdylan into master"
Merge pull request #28 from teamcoolguys/revert-27-master

Revert "developmentdylan into master"