Keeping `compare` only inside gh-pages branch
Merge branch 'master' into gh-pages

Conflicts:
	compare/index.html
Keeping compare only here