For some reason, I have to commit.
Merge branch 'master' of https://github.com/discobots2587/disco-frc
I am committing for some reason.
Merge branch 'master' of https://github.com/discobots2587/disco-frc
Patrick and I were trying to test the code and made a few changes to it.
Xavier and I tested the robot and changed how the robot drives.  Tank drive was reversed, but we fixed that.  Holonomic drive would only move in one direction, but we fixed that as well.
I have to commit this to pull.
Merge branch 'master' of https://github.com/discobots2587/disco-frc

Conflicts:
	2014-AerialAssist/AerialAssist/nbproject/private/private.xml
	2014-AerialAssist/VisionTest/nbproject/private/private.xml
	2014-AerialAssist/VisionTest/src/vision/MainVision.java