k
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/AfterColorConvert.png
	ImageTest/RouteTest3.png
	ImageTest/balls.png
	ImageTest/readyForBallMethodGrey.png
g