Merge pull request #27 from teamcoolguys/master

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

Revert "developmentdylan into master"
Merge pull request #29 from teamcoolguys/Development-Dylan

Development dylan