Fix .gitignore
Merge remote-tracking branch 'origin/update-gitignore'
Merge branch update-gitignore