repair template
Merge remote-tracking branch 'upstream/master' into fixhtml

update the fork
Merge pull request #38 from Midnighter/fixhtml

Fix the HTML page template to close tags