made shooter a little nicer
fixed obscene ('whack') compile errors
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

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

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

Conflicts:
	shooter.cpp
Merge branch 'master' of git://github.com/anidev/612-2013
network table