modify the .gitignore
Merge remote-tracking branch 'refs/remotes/origin/gh-pages' into gh-pages