first commit

big description
Merge pull request #2 from danveith1/master

first commit