no html in master
keep html out of master
merging from master with removed tempalte.html