Merge pull request #3 from icaughley/master

Git confusion