updated master with changes made to gh-pages