stuff, not sure what. Merge later.
fixed another swap
Update To Shooter

Running But Not Tested on actual robot
merge work done last night. Lift Ledstrip, shooter? state shooting?
fixed compile errors
Merge https://github.com/ZackAlfakir/612-2013 into mergeZack

Conflicts:
	lift.cpp
change
Last Nights Code
Working Auto And Teleop

Teleop: working and tested
Auto: Working And NOT Tested On Field
Needs somework
Revert "Needs somework"

This reverts commit 97c18ca6d541350f2fc90b791dd7d5d7884a3233.
changes