en funktions forklaring
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rapporten/Rapport.pdf
	Rapporten/Rapport.toc
	Rapporten/problem/losning.tex
Merge branch 'master' of https://github.com/Haurum/P1

Conflicts:
	Rapporten/Rapport.pdf
	Rapporten/Rapport.toc
	Rapporten/formalia/forside.aux
	Rapporten/problem/losning.tex