copy from skeleton
Merge pull request #27 from connoranderson0418/master

Connor Anderson Pull Request 1