merged dist/ into gh-pages