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

Conflicts:
	Slutrapport/text/konstruktion/robothand.tex
Merge branch 'master' of https://github.com/Cadynum/kandidat