Ignore .DS_Store files too
Merge remote-tracking branch 'upstream/master'