Update .gitignore
Update .gitignore
Merge branch 'master' into HEAD