Merge branch 'master' into PID

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
Merge remote-tracking branch 'origin/master' into PID

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/subsystems/DriveSubsystem.java
Added 3 more encoders (for a total of 4)
Edited getEncoder method.
Encoder tuning
PID with encoder testing code
Rewrote ClickTest
Merge branch 'master' into PID

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/OI.java
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotMap.java
Screwing with ClickTest, nothing really came of it
Fixed Z squaring away negatives
Put PID code that was commented out back in for testing purposes.
Trying to fix the PIDSubsystem...
Just want to merge
Merge branch 'PID' of https://github.com/WestervilleWildWarbots/master into PID
Tried to add setDistancePerPulse. We used inches - I will double-check that this is right.
PID Messing
PID Messing
Testing PID using setSetpoint. It doesn't do anything. What a surprise.
Functional PID Toggle
Made setup methods, added P, I, & D to RobotMap, and added setContinuous