Ignore .DS_Store.
Merge commit '20b99eb'