Klar med metod
Merge branch 'master' of https://github.com/pnutus/Sublabb

Conflicts:
	Hotlab/hotlab.tex