did stuff
Merge branch 'master' of https://github.com/RingOfFireOrg/FT2014
Merge branch 'master' of https://github.com/RingOfFireOrg/FT2014
Servo code is on and working, sort of
add working servos
Merge branch 'master' of https://github.com/RingOfFireOrg/FT2014

Conflicts:
	sketchbook/robot_3_new/robot_3_new.ino