Merge gh-pages branch with master branch