Nolan, Eric, and I were testing the choo choo.  Nolan got it working.
Nolan, Eric and I tested the choo choo.  Nolan got it working.
I am working through pull issues at the moment.
I am working through pull issues.
Merge branch 'master' of https://github.com/discobots2587/disco-frc

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