#move all html file to template folder
#clean up index.html and video.html
Merge branch 'master' of https://github.com/huskycode/thsea.git
Conflicts:
	public/index.html
Merge branch 'master' of https://github.com/huskycode/thsea.git

Conflicts:
	public/index.html