添加.gitignore
Merge branch 'dev' into gh-pages