typo fix
Merge branch 'master' into gh-pages
fix bad merge - a bunch of repeated content, and bad urls
Merge branch 'master' into gh-pages
update html