Merge pull request #22 from teamcoolguys/master

dylan
dylan fraser
Merge pull request #25 from teamcoolguys/Development-Dylan

Development dylan