Merge branch 'update-gitignore'
Merge remote-tracking branch 'origin/master'