Merge branch 'master' into develop

* master:
  added gitflow example
:qMerge branch 'release'

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

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

* develop: