overwriting gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	src/scrollbench.js
Merge branch 'master' into gh-pages
fix typo again