no longer using global namespace
Merge branch 'gh-pages' into polish

Conflicts:
	main.js