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

...op

* 'master' of https://github.com/volcomism/git-tut: