first commit
Merge pull request #1 from achristman2/master

first commit, pull request