templates begin
Merge branch 'master' of https://github.com/steinarv12/EvaluationApp

Conflicts:
	index.html
	src/controllers/evaluation.js
	templates/evaluation.html
	templates/login.html
Merge branch 'master' of https://github.com/steinarv12/EvaluationApp