Changed SafeToFire switch to match actual robot design
This branch was not based on the latest

Merge branch 'origin/master'

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