Changed analog input to an ultrasonic sensor.
Merge branch 'master' of git@github.com:CRRobotics/Robots.git
Hopefully resolved merge issues

Conflicts:
	CodeRedRobot2014/Commands/Drive/JoystickDrive.cpp