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

Conflicts:
	Slutrapport/text/metod/robothand.tex