consolidate master and gh-pages