endring i fil
lager kvalm

fremprovoserer conflict
Merge remote-tracking branch 'origin/LarsBranch'

Conflicts:
	heihei.txt