mer text 3
Konflikt fixad
Merge remote-tracking branch 'origin/Viktor'

Conflicts:
	Energilab.tex