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

Conflicts:
	ImageTest/AfterColorConvert.png
	ImageTest/BrownThreshold.png
	ImageTest/RouteTest3.png
	ImageTest/TEST.png
	ImageTest/balls.png
	ImageTest/billed0.png
	ImageTest/edge.png
	ImageTest/robo.png
	ImageTest/src/CallibratorGUI/CallibratorGUI.java
	ImageTest/src/pictureToMat/DetectBorder.java