Eric and I made the choo choo respond to the limit switch.  I added code for a pneumatapult.
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2014-AerialAssist/AerialAssist/src/org/discobots/aerialassist/commands/CommandBase.java