added ds_store to gitignore
merge commit