updated html for hw6
bugs
bgs
Merge branch 'develop' into staging