Merge pull request #12 from AlanDeSmet/master

Move to template engine
fix closing span tag
fix closing span tag
fix closing span tag
fix closing span tag
fix closing h1 tag
Merge branch 'master' into cleanup-thanks