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

Conflicts:
	ImageTest/.classpath
	ImageTest/billed0.png
	ImageTest/src/pictureToMat/ballMethod.java