Adding new html stuff
Fixed server stff
Studd
Asdf
Fixes
Merge pull request #1 from wjwwood/william

William