eng samman
Merge branch 'master' of https://github.com/Cadynum/kandidat
Merge branch 'master' of https://github.com/Cadynum/kandidat

Conflicts:
	Slutrapport/text/sammanfattning.tex