consolidated master and gh-pages