add Dan's live changes
merge and ignore .DS_Store