hej
Merge branch 'master' of https://github.com/AslakNiclasen/ProjektOpgave

Conflicts:
	delrapport1.pdf