idk
Merge branch 'master' of https://github.com/Haurum/P1

Conflicts:
	Rapporten/Rapport.pdf
	Rapporten/formalia/forside.aux