Update .gitignore
Update .gitignore
fixed .gitignore files
Merge remote-tracking branch 'upstream/master'
...