changed ultrasonic to analog channel and made sure the collector comes in then out before shooting.
changed ultrasonic to analog channel and made sure the collector comes in then out before shooting.
Merge origin/master

Conflicts:
	src/edu/team3182/main/Robot3182.java