Revert b920408..b6f346f

This rolls back to commit b920408fb42a955b86de553b097506865f01bbbd.
redo build
Merge branch 'master' into gh-pages

Conflicts:
	index.html