new
new Merge branch 'master' of https://github.com/tadamiec/LEGO-Mindstorms

Conflicts:
	IARobot/src/ColorDetect.java