Fixed problems
Merge branch 'master' of https://github.com/JSmith16/CartBot

Conflicts:
	Cart2015/CircuitPi/build/us/oh/k12/wkw/cart/circuitPi/OI.class
	Cart2015/CircuitPi/build/us/oh/k12/wkw/cart/circuitPi/circuitPi.class
	Cart2015/CircuitPi/build/us/oh/k12/wkw/cart/circuitPi/commands/ArmGoDown.class
	Cart2015/CircuitPi/build/us/oh/k12/wkw/cart/circuitPi/commands/ArmGoUp.class
	Cart2015/CircuitPi/build/us/oh/k12/wkw/cart/circuitPi/commands/CommandBase.class
	Cart2015/CircuitPi/build/us/oh/k12/wkw/cart/circuitPi/commands/DriveDoNothing.class
	Cart2015/CircuitPi/build/us/oh/k12/wkw/cart/circuitPi/commands/DriveWithJoysticks.class
	Cart2015/CircuitPi/build/us/oh/k12/wkw/cart/circuitPi/subsystems/DriveSystem.class
	Cart2015/CircuitPi/j2meclasses/us/oh/k12/wkw/cart/circuitPi/OI.class
	Cart2015/CircuitPi/j2meclasses/us/oh/k12/wkw/cart/circuitPi/circuitPi.class
	Cart2015/CircuitPi/j2meclasses/us/oh/k12/wkw/cart/circuitPi/commands/ArmGoDown.class
	Cart2015/CircuitPi/j2meclasses/us/oh/k12/wkw/cart/circuitPi/commands/ArmGoUp.class
	Cart2015/CircuitPi/j2meclasses/us/oh/k12/wkw/cart/circuitPi/commands/CommandBase.class
	Cart2015/CircuitPi/j2meclasses/us/oh/k12/wkw/cart/circuitPi/commands/DriveDoNothing.class
	Cart2015/CircuitPi/j2meclasses/us/oh/k12/wkw/cart/circuitPi/commands/DriveWithJoysticks.class
	Cart2015/CircuitPi/j2meclasses/us/oh/k12/wkw/cart/circuitPi/subsystems/DriveSystem.class
	Cart2015/CircuitPi/nbproject/private/private.xml
	Cart2015/CircuitPi/src/us/oh/k12/wkw/cart/circuitPi/OI.java
	Cart2015/CircuitPi/src/us/oh/k12/wkw/cart/circuitPi/RobotMap.java
	Cart2015/CircuitPi/src/us/oh/k12/wkw/cart/circuitPi/circuitPi.java
	Cart2015/CircuitPi/src/us/oh/k12/wkw/cart/circuitPi/commands/DriveWithJoysticks.java
	Cart2015/CircuitPi/src/us/oh/k12/wkw/cart/circuitPi/subsystems/DriveSystem.java
	Cart2015/CircuitPi/suite/CircuitPi_1.0.0.jar
Fixed Joystick Problem