lots of code . . . (later)
added more stuff to feeder
fixed my derp
Added shifter
Merge pull request #21 from AlonBendelac/master

wrote joysmooth class
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj
Merge branch 'swaraj'

Conflicts:
	joysmooth.cpp
	joysmooth.h
Merge pull request #23 from bqtruong/master

wrote shifter
Merge branch 'master' of git://github.com/anidev/612-2013
Compiling clean up
Modifications to state and added global state
612 files
add the target class
TeleopPeriodic
Added jaguar information
Merge pull request #24 from bqtruong/master

TeleopPeriodic
added to state_drive.cpp
Merge pull request #25 from swarage/master

Added Arcade Drive code
added encoder code