merge gh-pages unto master