Formatting
Merge branch 'master' of https://github.com/frc-2175/JavaRobot2014

Conflicts:
	src/org/usfirst/frc2175/Robot2014/Ramp.java

I really shouldn’t make edits if Aren is editing too…
Merge branch 'master' of https://github.com/frc-2175/JavaRobot2014