Adding .DS_Store to .gitignore. This is gonna cause a merge conflict
merge for gitignore