added a function to detect that we are out of frisbees
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	shooter.cpp
fixed stuff
fixed more stuff
added climbing state to main.cpp (something Zack might have forgotten)
added state climbing stuff

most credit to Zack
fixed whack stuff
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