test gh-pages
Merge branch 'master' into gh-pages
test gh-pages, w/html generated