Update .gitignore

Added OS generated
Update .gitignore

Added OS generated files
Merge remote-tracking branch 'upstream/master'