branch test
add ..quick AND simple
add ...quick & simple
conflict fixed
add a new line
merge with no-ff
fix bug 101
merged bug fix 101