DS_store...
Merge branch 'objective2' of https://github.com/fredriklind/D7024E-Lab into objective2

Conflicts:
	.DS_Store