..

Signed-off-by: Henrik Krüger-Jensen <henrikkrugerjensen@gmail.com>
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/src/CallibratorGUI/CallibratorGUI.java