commiting ds store
fixing merge
adding files
fucking ds_store
Ignoring fucking DS_Store