added .DS_Store to gitignore file
merged .gitignore conflicts