removed .DS_Store from branch so that I can merge