Add .DS_store to .gitignore
Merge branch 'test'