correct file name
added html template
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	template.html
	tepmlate.html