cuts superfluous bilge
fixing header merge conflicts
Merge pull request #14 from FilWisher/fixinghtml

Fixinghtml