Det er min der gælder!
Merge branch 'master' of https://github.com/bhuberDADIU/DADIU-Team-2

Conflicts:
	test.txt