Added subsystem
Merge branch 'DSEIO' of https://github.com/WestervilleWildWarbots/master
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master
Color Sensor
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master
Merge branch 'Testing'
Nothing
Merge branch 'master' of https://github.com/WestervilleWildWarbots/master

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/OI.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/PickupSubsystem.java
Fixed Color Sensor
Merge branch 'master' into Testing

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/OI.java
Fixed servo off interrupt sensor
Fixed everything in here except vision and holding the shooter arm up
automatically