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
fixed jeffs code
this amuses me
wrong form of amusement
Merge branch 'master' of git://github.com/anidev/612-2013
fixed some compile errors. I am planning to add vision stuff later
Made class for Network Table
added Taj to authors
Network Table
fixing autonomous
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