Added preset speeds
Merge origin/CompBot into CompBot

Conflicts:
	src/org/usfirst/frc4946/BetaRobot.java