Fixed lint error
Fixed lint error
Merge branch 'master' of https://github.com/simensma/GroupRec
Fixed lint error
Small Bugfixes
Merge branch 'master' into evaluation

Conflicts:
	WebSite/app/views/results.html