I started to make the CANJaguars and such.
I started to make the CANJaguars.
testing stuff, added import for color sensor
I started working on CANJaguars and color sensor.
Merge origin/PickupSubsystem into PickupSubsystem
Still working on CANJaguars and color sensor. Added runCANJaguar method.
Merge branch 'master' into PickupSubsystem

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/DriveCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/commands/MonitorCommand.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/DriveSubsystem.java
Added getColor
Merge remote-tracking branch 'origin/master' into PickupSubsystem

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/DriveSubsystem.java
Added limit switch (identical to the one in ShooterSubsystem).
Fixed runJaguar method and got rid of everything related to the limit switch.
Tried to fix limit switch.
Changed limit switch method name.
Fixed and added methods in subsystem.  Colors are now booleans, not string.  Added distance sensor.  None of code tested yet.
Changed distance sensor units to inches.
Corrected PickupSubsystem
Minor
(Nothing has changed that I can remember - just committing so I can pull new changes.)
Merge origin/PickupSubsystem into PickupSubsystem

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/PickupSubsystem.java
3 new commands: MovePickupArm, MoveRollersCommand, PickupCommand