deleted all .DS_Store files
Merge branch 'deleted_all_ds_store_files' into develop
Merge branch 'develop'