updaing master branch with changes made in gh-pages branch