added template-main.html and temp-styles.css[master]
fixed merge conflict in html/index.html[master]