branch test
and simple
& simple
conflict fixed
add xufeng
merge with no -ff
fix bug 101
merged bug fix 101