Signed-off-by: Sædvanlige ændringer :D <Emil@10.16.106.85>
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/src/Controller/PrimaryController.java
	ImageTest/src/pictureToMat/TakePicture.java
WORKS KL: 14:07

Signed-off-by: Sædvanlige ændringer :D <Emil@10.16.106.85>