de la merde
Merge branch 'master' of github.com:tadamiec/LEGO-Mindstorms

Conflicts:
	IARobot/Main.nxd
	IARobot/Main.nxj
	IARobot/bin/CollisionLeft.class
	IARobot/bin/CollisionRight.class
	IARobot/bin/FollowTheWall.class
	IARobot/bin/Main.class
	IARobot/bin/OpenADoor.class
	IARobot/src/CollisionLeft.java
	IARobot/src/CollisionRight.java
	IARobot/src/FollowTheWall.java
	IARobot/src/Main.java