new flow chart, and linking picture to master
Merge branch 'git_flow' into dev