my first commit
Merge pull request #4 from forshaw/master

my first commit