change
merge
refactiorin
Merge branch 'master' into gh-pages

Conflicts:
	js/substeps.js