3.e indledende tekst
Merge branch 'master' of https://github.com/Project-Props/Delrapport-2

Conflicts:
	Delrapport-2.synctex.gz
	Delrapport-2.tex