branch dev test
add sunyonggang.txt
and simple
& simple
change to 'and simple'
add merge
merge with no-ff
fix bug 101
merged bug fix 101
add more