branch test
creating a new bransh is quick
simple
confilt fixed
git branch
master branch
master
readme
merge with no-ff
newbranch
nw
merge nw