fg
asd
gdh
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rapporten/Rapport.pdf
	Rapporten/formalia/forside.aux
	Rapporten/problem/losning.tex
	Turister/Diskussion.docx