Started removing magin nums.
Done
Merged master into iss6.
made a branch issue9, renamed UnFire to ArmCatapult, and refactored Catapult subsystem.
Fixed the issue.
Merge pull request #12 from BitBucketsFRC4183/iss8

Fixed the issue.
Should work now.........
Merge branch 'origin/master'

Conflicts:
	org/bitbuckets/frc2014/RobotMap.java
Merge pull request #13 from BitBucketsFRC4183/issue9

Looks good. Merging.
Made stuff work with the current robot config. Also edited the controls a little.
Added safety. Moved shifting to neutral to the fire command from the arm command.
Merge pull request #21 from BitBucketsFRC4183/iss16

Done stuff
Fixed Issue #22: squared drivetrain inputs.
Merge pull request #23 from BitBucketsFRC4183/Issue22

Fixed Issue #22: squared drivetrain inputs.
Merge branch 'master' into AutonBase.