fixed some html stuff
Merge branch 'master' into fixing_html
Merge pull request #8 from UberMouse/fixing_html

Fixing html