Added .DS_Store to .gitignore
Merge branch 'master' into accuracy