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

Conflicts:
	Rapporten/Rapport.log
	Rapporten/Rapport.pdf
	Rapporten/Rapport.synctex.gz
	Rapporten/appendiks/sporgeskema.tex