Merge branch 'master' of git://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
Merge branch 'master' of git://github.com/anidev/612-2013
Some Changes Zack
Zack's Best Change Ever!

Its actually jeff and this is just some minor changes to autoshooter.
Merge branch 'master' of git://github.com/anidev/612-2013
Made class for Network Table
added Taj to authors
Network Table
AutoShooter Now works at 50%

Still needs work but the framework is done
Minor change
Merge pull request #48 from JeffTolbert/master

Dont accept Authors.rst
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

Conflicts:
	AutoShooter.cpp
	autonomous.cpp
Fixed jeff's autoshooter formatting
Merge pull request #53 from AlonBendelac/master

Network Table
Fixed NetworkCom compile errors
adrian's joysmooth