remove ds_store
Merge branch 'changes' into develop
Merge branch 'develop' into gh-pages