modifying on local
Merge branch 'master' of github.com:jmburges/git-flow