first time to commit all the code before
Merge branch 'master' of github.com:Hongcheng/daiziguizhongtest