La inn test for scenario1
Merge branch 'master' of https://github.com/Oyvindkg/TDT4140-Gruppe-23

Conflicts:
	oving3/assignment_3.pdf
	oving3/assignment_3.synctex.gz