copy from skeleton
Merge pull request #34 from tshaffer2/master

Tyler Shaffer