branch test
add fast
AND simple
& simple
conflict resolved
addd mmerggge
merge with no-ff
fix bug 101
merged bug fix 101