Update .gitignore

Removing .DS_Store and .idea files
Merge remote-tracking branch 'upstream/master'
merging upstream