brach test
add,test another.
AND simple
& simple
confict fixed
add zhangzhenqiang
merge with no-ff
fix bug 101
merged bug fix 101