små ting
Merge branch 'master' of https://github.com/Jelb/BOSC

Conflicts:
	oo3/rapport/metode.tex