More tests
Merge branch 'master' of https://github.com/steinarv12/EvaluationApp

Conflicts:
	src/controllers/evaluation.js
	src/controllers/result.js