branch test
AND simple
& sipmle
conflict fixed
readme.txt
add merge
merge with no-ff
fix bug 101
merged bug fix 101