Merge branch 'master' of https://github.com/volcomism/git-tut into develop

* 'master' of https://github.com/volcomism/git-tut:
Merge pull request #3 from volcomism/develop

Merge branch 'master' of https://github.com/volcomism/git-tut into devel...