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

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