deploy.sh: try mergeing master into gh-pages