html to template
Merge pull request #72 from vomikan/master

html to template