Basic encoder code
Basic encoder code
Basic encoder code
Merge branch 'master' of https://github.com/Team-1277/Robot-Code.git
Basic encoder code
Lights
merging
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/org/team1277/robot/MainRobot.java