Save!!!!!
Merge remote-tracking branch 'upstream/master'
sdasdf
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ArcadeDriveRobot/src/org/usfirst/frc4915/ArcadeDriveRobot/Robot.java
Fixed references to static values
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ArcadeDriveRobot/src/org/usfirst/frc4915/ArcadeDriveRobot/RobotMap.java
	ArcadeDriveRobot/src/org/usfirst/frc4915/ArcadeDriveRobot/commands/HarvesterWheelsBack.java
	ArcadeDriveRobot/src/org/usfirst/frc4915/ArcadeDriveRobot/commands/HarvesterWheelsForward.java
	ArcadeDriveRobot/src/org/usfirst/frc4915/ArcadeDriveRobot/commands/IntakeRelease.java
Merge pull request #54 from KeetCurtis/master

Fixed references to static values