Removed DS Store

deleted the .DS_store file
Merge branch 'dev'