remove ds_store
Merge branch 'changes' into develop