Added some pneumatic code
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:

2014-AerialAssist/AerialAssist/src/org/discobots/aerialassist/commands/C
ommandBase.java