PLEASERINO!
Merge remote-tracking branch 'origin/master'

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