origin/master
 branch test
and simple
& simple
conflict fixed
 add hello kugou.
merge with no-ff
 fix bug 101
fix bug 101
merged bug fix 101