added git-flow
Merge pull request #70 from jockri/add_git_flow

added git-flow