removed .DS_Store file
Merge branch 'master' into gh-pages