merging changes accidentally committed in gh-pages