branch test
test add file in master
conflict fixed
add no-ff
merge with no-ff
fix bug 101
merged bug fix 101