Merge pull request #12 from ZackAlfakir/master

More Kate swap files, Moved tolerance to controls.h, Some shift functons
Fixed zack's compile errors.

Zack fix your compiler!
Made joystick more robust
Fixed stuff with global robot and pointers in robot_class
Modified Shift.cpp