test 2
test 3
i have just run the code

netbeans writes the time of the last time the code has run
Merge branch 'branch-2'

Conflicts:
	build/built-jar.properties
	build/classes/RobotRace$Camera.class
	build/classes/RobotRace$Drawer.class
	build/classes/RobotRace$RaceTrack.class
	build/classes/RobotRace$Robot.class
	build/classes/RobotRace$SolidShapes.class
	build/classes/RobotRace$Terrain.class
	build/classes/RobotRace$WiredShapes.class
	build/classes/RobotRace.class
	build/null1802921478
	build/null1922748590
	build/null264329318
	dist/RobotRace.jar
	src/RobotRace.java