Shooter Changes
Merge branch 'master' of https://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
Formatting and launcher 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
Minor changes to auto_encoders
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
Merge pull request #32 from AlonBendelac/master

Encoders
Removing bad shooter files until JEFF FIXES IT
Merge branch 'master' of github.com:anidev/612-2013
Compile error fix in shooting state and manual shooting at same time as
driving
Fix compile errors
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

Conflicts:
	auto_encoders.cpp
	auto_encoders.h
Merge branch 'swaraj'

Conflicts:
	auto_encoders.cpp
	auto_encoders.h