Some changes to lab3.h
changes based on demo feedback
Merge branch 'master' of https://github.com/Drotth/DA170A-labs
Fixed merge conflict
Merge branch 'master' of https://github.com/Drotth/DA170A-labs
Merge branch 'master' into mattias

Conflicts:
	lab2/lab2/main.cpp
Merge branch 'mattias' of https://github.com/Drotth/DA170A-labs into mattias

Conflicts:
	lab5/lab5/String.h