Signed-off-by: s120561 <s120561@OP990-8R6635J.b45x.dtu.dk>
conflict-løsning. alt virker

Merge branch 'master' of https://github.com/emilhein/16_CDIOFinal.git

Conflicts:
	16_CDIOFinal/build/classes/Main.class
	16_CDIOFinal/build/classes/controller/Boundary.class

Signed-off-by: s120561 <s120561@OP990-8R6635J.b45x.dtu.dk>