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

Conflicts:
	Slutrapport/Gammaltrorej/metod.tex
	Slutrapport/Gammaltrorej/samman.tex
	Slutrapport/Gammaltrorej/servoberakningar.tex
Merge branch 'master' of https://github.com/Cadynum/kandidat