You Merged Wrong
Minor
Added const for lift speed
Removed driver check from update and added relay strip
Increased turn speed
Adjustable speed adjust speed
Encoder testing
climbing state stuff
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	main.cpp
Merge branch 'swj'

Conflicts:
	drivetrain.cpp
	states/state_driving.cpp
Removed extraneous Joysmooth.h...
RPS speed instead of PWM value
4 speeds for test code
Added lift down for climbing state
Circumference for new robot
polished autonomous.cpp and state_climbing.cpp