merges gh-pages with master