oh still testing
Merge branch 'testing' into gh-pages

Conflicts:
	js/init.js