UC4 + ACTEST4 - version 1
Merge branch 'master' of https://github.com/mickkn/E2PRJ2GRP1

Conflicts:
	Projektdokumentation/Master.log
	Projektdokumentation/Master.pdf
	Projektdokumentation/Master.synctex.gz
	Projektdokumentation/Master.toc
	Projektdokumentation/filer/kravspec.aux
version 2
version 2
test
Merge branch 'master' of https://github.com/mickkn/E2PRJ2GRP1

Conflicts:
	Projektdokumentation/Master.log
	Projektdokumentation/Master.pdf
	Projektdokumentation/Master.synctex.gz
	Projektdokumentation/Master.toc
	Projektdokumentation/filer/kravspec.aux
UC4 ACTEST4
Merge branch 'master' of https://github.com/mickkn/E2PRJ2GRP1

Conflicts:
	Projektdokumentation/Master.log
	Projektdokumentation/Master.pdf
	Projektdokumentation/Master.synctex.gz
	Projektdokumentation/filer/accepttest.aux
	Projektdokumentation/filer/kravspec.log
UC4