added some files from mariam, removed ds_store
conflict resolution?
conflict resolution?