Add .DS_store to .gitignore
Merge remote-tracking branch 'origin/test' into HEAD