import .jar
Merge branch 'master' of https://github.com/phllipo/RoboRace

Conflicts:
	mindstorms/.classpath