add branch dev
add a new branch feacture1
master:modify readme.md
conflict fixed
create new branch
merge with no-ff
fix bug 101
merge bug fix 101
conflic fixed
fix issue 111
merge bug 111