Ferdig og levert Øving 2 og 3
Start Øving 4
merge
Merge branch 'master' of https://github.com/draperunner/MMI

Conflicts:
	src/oving3/PassivePersonPanel.java