Shooter works - needed to apply power to the solenoid module (took the power cable from the analog module)
Compressor works - relay is fixed.
Shoot, drive, and shoot piston work.
Need to work on compressor, arm, jerky drive.
Added talon compressor code, arm pneumatic code,
commented some stuff.
fixed comment errors
Refactored arm code into collector and added associated commands
Added OI calls to enable shooter setpoint manipulation
Added data to dashboard
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2013-UltimateAscent/UltimateAscension/src/org/discobots/frc/ascent/HW.java
	2013-UltimateAscent/UltimateAscension/src/org/discobots/frc/ascent/OI.java
	2013-UltimateAscent/UltimateAscension/src/org/discobots/frc/ascent/commands/CommandBase.java
	2013-UltimateAscent/UltimateAscension/src/org/discobots/frc/ascent/subsystems/Collector.java
	2013-UltimateAscent/UltimateAscension/src/org/discobots/frc/ascent/subsystems/Drivetrain.java
	2013-UltimateAscent/UltimateAscension/src/org/discobots/frc/ascent/subsystems/Shooter.java
Merged differing collector arm code