branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
zhenghe
fix  bug 101
merged bug six 101
dev over
merged dev