create a new branch and test fast forward mode
merge the dev with no-ff mode
fix bug 101
merged bug fix 101
new python part
Merge branch 'dev'