Modify .gitignore for .DS_Store
Intermediate commit for merging repository