Reverted to previous working code
Merge branch 'master' of https://github.com/Drotth/DA170A-labs
Cleaned up lab3
Merge branch 'mattias'

Conflicts:
	lab3/lab3/lab3.h
added my changes to lab3
Merge branch 'master' of https://github.com/Drotth/DA170A-labs
Merge branch 'master' into mattias2