Updated template files with more appropriate html code.
Merge branch 'master' of github.com:melwil/techtasks