Merging
Merge branch 'master' of https://github.com/philleonard/LeJOS-Jason-MediBot

Conflicts:
	bin/classes/assignment_2/ArenaEnv.class
	bin/classes/assignment_2/NXT.class
	client/src/asl/scout.asl
	robot/.classpath
	robot/src/java/assignment_2/ArenaEnv.java