Deletes old files
Adds .DS_store
Merges with Master