Range Finder updated, updated automode, added constants.
Merge origin/CompBot into CompBot

Conflicts:
	src/org/usfirst/frc4946/Launcher.java
	src/org/usfirst/frc4946/RobotConstants.java
Merged code
Merge origin/CompBot into CompBot

Conflicts:
	src/org/usfirst/frc4946/Launcher.java
	src/org/usfirst/frc4946/RobotConstants.java
Merged code
fixed constant