add new branch
commit README under feature1
commit README under master branch
simple
add merge
merge with no ff
fix issue 101
merge bug fix 101