Possible fix to updating
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ArcadeDriveRobot/src/org/usfirst/frc4915/ArcadeDriveRobot/Robot.java
Merge pull request #30 from KeetCurtis/master

Possible fix to updating problem