fixed shooter stuff
fixed IR stuff
fixed value
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	shooter.cpp
fixed basic errors
(what else should be added to the IR stuff?)
Merge branch 'master' of git://github.com/swarage/612-2013 into swj

Conflicts:
	shooter.cpp
	shooter.h