removed dups
Merge branch 'master' into gh-pages
deploying 2 dups