manually merging the gh-pages branch with master.