made a branch issue9, renamed UnFire to ArmCatapult, and refactored Catapult subsystem.
Should work now.........
Merge branch 'origin/master'

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

Looks good. Merging.