merge commit
removed DS_Store