Working on switches.
Merge branch 'DSEIO' of https://github.com/WestervilleWildWarbots/master into DSEIO
Merge branch 'master' into DSEIO

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/OI.java
Removed some things the merge screwed up
Working on switches. Color, Shooter, and Pickup seem to be working. TractionControl and LEDRing have yet to be tested.
Merge branch 'DSEIO' of https://github.com/WestervilleWildWarbots/master into DSEIO

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/OI.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotMap.java
Merge branch 'master' into DSEIO

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/OI.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotMap.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/TestSwitches.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/CameraSubsystem.java
Switches are working unless I'm missing something