mod .gitignore
Merge branch 'master' of github.com:duanjunyu/test