my first commit
Merge pull request #18 from jdgamble/master

my first commit