fixed jeffs code
this amuses me
wrong form of amusement
fixed some compile errors. I am planning to add vision stuff later
fixing autonomous
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

Conflicts:
	AutoShooter.cpp
	autonomous.cpp