Fixing errors
Scrimmage Code
Merge origin/FinalBotCode into FinalBotCode

Conflicts:
	RobotCode2014/src/edu/wpi/first/wpilibj/templates/RobotMap.java
	RobotCode2014/src/edu/wpi/first/wpilibj/templates/commands/CommandBase.java
	RobotCode2014/src/edu/wpi/first/wpilibj/templates/subsystems/Chassis.java