merge
remove ds_store
change pictures