added git-flow
Merge pull request #27 from xoan/develop

added git-flow