Added .DS_Store to the .gitignore.
Merged.