Signed-off-by: Martineee <bengtssonmartine@gmail.com>
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/src/Controller/PrimaryController.java
	ImageTest/src/pictureToMat/TakePicture.java