lagt till slutsats
Merge branch 'master' of github.com:/hansfilipelo/TSRT12

Conflicts:
	labb_2/Rapport.lof