Merge pull request #12 from buren/branch_validations

Branch validations
Merge branch 'master' of github.com:buren/git-story into branch_validations