updated gitflow
Merge branch 'master' of github.com:jamestomasino/bin