Repairing merge errors in HTML
Merge pull request #22 from cwnidog/john-develop

Repairing merge errors in HTML