changed readColor to choose preset colorLoc array
Merge pull request #2 from nickpelone/master

Stop motors during IR check
removed duplicate code from merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	arduino_robot_main/arduino_robot_main.ino
added eastColorSets
added copyArray
removed redundant color checks
Attempt touch of blank file to resolve conflict
Merge remote-tracking branch 'upstream/master'

Conflicts:
	arduino_robot_main/arduino_robot_main.ino
Merge remote-tracking branch 'upstream/master'
added corrected colorSets, changed readColors
Merge remote-tracking branch 'upstream/master'
lessened gripper drop, fixed colorRef comparison, other small adjustments
Merge remote-tracking branch 'upstream/master'