Merge pull request #29 from KeetCurtis/master

v1.07.05 Fixed code for when gyro is null
Making changes to the joystick, adding a button for ejecting the ball, ejects the ball while held
Moved throttle calculation to new method in DriveTrain subsystem
Merge branch 'master' of https://github.com/Gnewt/bainbridgefirst
Updated throttle computations and SmartDashboard displays
Changes to the null pointer exception that was thrown
Stuff
Merge branch 'master' of https://github.com/Gnewt/bainbridgefirst
Making lots of changes to the intake system
Added the stopHarvesterWheels.java command
Possible fix to updating
Starts the wheels when the intake goes down
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ArcadeDriveRobot/src/org/usfirst/frc4915/ArcadeDriveRobot/Robot.java