update master with changes to gh-pages

surely there's a better way.