Updated gitignore to ignore .DS_Store files
Merge branch 'dev'