lots of little changes
merge prep
Merge branch 'master' of https://github.com/renezaal/RobotRace

Conflicts:
	src/RobotRace.java

merge prep