loader
Merge branch 'testing' into gh-pages

Conflicts:
	index.html