add gitignore
remove ds_store
Merge branch 'cleanup' into develop