Fixing the HTML merge errors
Merge pull request #23 from OrganicPanda/fix-html

Fixing the HTML merge errors