main wachseln
Merge branch 'master' of https://github.com/tadamiec/LEGO-Mindstorms.git

Conflicts:
	IARobot/bin/Main.class
	IARobot/src/Main.java