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

Conflicts:
	shooter.cpp
Compile fixes
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

Conflicts:
	shooter.cpp
changed autonomous to use AutoShooter