DetectBorders, pix to cm
l
f
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/AfterColorConvert.jpg
	ImageTest/Billed0.jpg
	ImageTest/RouteTest3.jpg