Merge pull request #2 from volcomism/feature2

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

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