modify .gitignore
Merge branch 'master' of https://github.com/mengchichiang/test2
ggg:wq