stavefejl
Merge branch 'master' of github.com:protective/GSC

Conflicts:
	Exam/bin/index.log