closes #7
workshop 09
Merge branch 'master' into gh-pages
update html