Merge pull request #1 from wangxiaoyuan/master

add bb.file
byjoy32123
resolve confilct