Merge pull request #25 from teamcoolguys/Development-Dylan

Development dylan
Revert "Development dylan"
Merge pull request #26 from teamcoolguys/revert-25-Development-Dylan

Revert "Development dylan"
Merge pull request #27 from teamcoolguys/master

developmentdylan into master