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

Conflicts:
	ImageTest/AfterColorConvert.png
	ImageTest/BrownThreshold.png
	ImageTest/RouteTest3.png
	ImageTest/balls.png
	ImageTest/billed0.png
	ImageTest/edge.png
	ImageTest/readyForBallMethod.png
	ImageTest/readyForBallMethodGrey.png
	ImageTest/robo.png
	ImageTest/src/pictureToMat/RouteTest.java
Signed-off-by: Sædvanlige ændringer :D <Emil@10.16.106.85>