we improved the autonomous code
Merge branch 'master' of github.com:anidev/612-2013
new changes to shooter and launcher
polishing autonomous
(this editor is annoying) adding some autonomous stuff the subroutines need a bit more work, with vision and all, but other than that it should be good.
more polishing of autonomou
Merge branch 'master' of github.com:anidev/612-2013
hard coding some autonomous stuff
fixed timeout errors
fixed more errors TT^TT
added another if to autonomous, trying to get rid of infinite loops
fixing autonomous again
Merge pull request #46 from swarage/master

fixed autonomous
Merge branch 'master' of git://github.com/AlexMaxseiner/612-2013 into alex

Conflicts:
	shooter.cpp
	shooter.h
Line endings
Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013