finat till
Merge branch 'master' of ssh://github.com/Cadynum/kandidat

Conflicts:
	mittrapport/main.tex