Made joystick more robust
Fixed stuff with global robot and pointers in robot_class
Modified Shift.cpp
Merge pull request #15 from ZackAlfakir/master

Modified Shift.cpp
encoders
Merge branch 'master' of github.com:anidev/612-2014-advanced

Conflicts:
	DerekDrive.cpp
	DerekDrive.h
added autoDrive

one thing I don't understand is what should be going on in update

I'm pretty sure autoDrive is incorrect, but can be fixed (incorrect as in function wise; it compiles)
teleop drivetrain?