first commit
Merge pull request #4 from jamesbarnes/master

pulling!