working with nerw shooter code
Pseudo-Fixed Shooter Code
Merge branch 'chassis' of https://github.com/DevilTech/Robotics2014 into chassis
New State Machine and added Ball Sensor
works
Pre-Rally

Shooter Works, Gatherer arms must be down
gatherer count
more changes - motors dropping out?
just before rally
blah things happened
mergey merge merge

Conflicts:
	src/Competition/Wiring.java
	src/Control/Control.java
	src/Control/XboxMap.java
	src/edu/wpi/first/wpilibj/templates/DriveSystem.java
	src/edu/wpi/first/wpilibj/templates/Gatherer.java
	src/edu/wpi/first/wpilibj/templates/Happystick.java
	src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
	src/edu/wpi/first/wpilibj/templates/Shooter.java