Added Joystick control to drivetrain
Merge branch 'master' of https://github.com/HVA-FRC-3824/2014_Competition_Robot

Conflicts:
	CompetitionRobot/src/org/usfirst/frc3824/CompetitionRobot/OI.java
	CompetitionRobot/src/org/usfirst/frc3824/CompetitionRobot/commands/VacuumControl.java