Shooter Changes
Merge branch 'master' of https://github.com/anidev/612-2013
Added shooting_auto and shooting_manual class.
Added 2 classes: shooting_auto and shooting_manual
Merge branch 'master' of git://github.com/anidev/612-2013
Merge pull request #28 from ZackAlfakir/master

Feet=>Inches
Merge pull request #29 from AlonBendelac/master

state_shooting
Merge branch 'master' of git://github.com/anidev/612-2013
Formatting and launcher stuff
fixed stuff
Changed tabs to four spaces
Some network table stuff and misc stuff
made left_encoder1, right_encoder1, left_encoder2, right_encoder2
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	main.cpp
Merge branch 'master' of git://github.com/anidev/612-2013
Minor changes to auto_encoders
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/JeffTolbert/612-2013 into jeff

Conflicts:
	launcher.h
Merge branch 'jeff'

Conflicts:
	612.h
	launcher.cpp
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

Conflicts:
	auto_encoders.cpp