html tpl management
Merge branch 'master' of https://github.com/keara34/quizplayer

Conflicts:
	src/views/html/quiz.html
	src/views/quizView.js