branch
and simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
add yincang
Merge branch 'dev'