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

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