my first commit
Merge pull request #15 from denvereezy/master

my first commit