created branch and updated git ignore - issue#1
added template.html - fixes #1
Merge branch 'issue#1' into dev
Merge branch 'dev'