dfsdcx
Merge branch 'master' of https://github.com/lumpyrocks/Roobotics_FRC_I

Conflicts:
	src/edu/wpi/first/wpilibj/templates/RooAutoRangerSensorPair.java