Merging updated gh-pages