Some v. minor changes that don't change anything but whitespace.
Merge branch 'master' of https://github.com/fremontrobotics/oddjob

Conflicts:
	src/edu/wpi/first/wpilibj/templates/RobotTemplate.java