I need to pull.
I need to pull.
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2014-AerialAssist/AerialAssist/nbproject/private/private.xml
	2014-AerialAssist/AerialAssist/src/org/discobots/aerialassist/HW.java
Something weird is happening.
Something weird is happening.
I made it so that the air compressor runs off of a Victor instead of the spike.  Patrick wrote code for the choo choo, but we were having trouble with the limit switch.  Line 28 in ChooChoo.java is causing problems, so I commented it out.  An error occurs because it thinks that the channel assigned to the limit switch is already assigned even though it is the only thing to be assigned that channel.