some changes
Merge branch 'master' of github.com:biaobiaoqi/biaobiaoqiCode
some problems