update after day 2 of in-class
Merge branch 'master' of https://github.com/jroesch/hweb