removed DS_Store
updating to branch master