change shuoming
add new1
Merge branch 'master' of github.com:shupixiu/test