Removed .DS_Store from git index. Added to .gitignore. If git wants to track .DS_Store again, run '$ git rm --cached .DS_Store' in the terminal.