merge fixes
added .ds_store to gitignore