Merge pull request #3 from wangxiaoyuan/master

reslove conflict
bb.txt
Merge remote-tracking branch '1010am/master'