Update README.md
Moving branching towards gitflow
Merge branch 'master' into develop