merge
merge
merge
cleaning up all the .DS_Store folders
cleaning up all the .DS_Store folders