did stuff
Merge pull request #38 from cshaver88/master

did stuff