fixed shooter a little bit.
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	shooter.h
Merge branch 'master' of github.com:anidev/612-2013
changed some files, added lift to the code
note: state_shooter still doesn't allow the code to compile
note2: we still need to declare some motors and stuff in order to be able to have autonomous lift and shoot
this code compiles, but the port numbers and such for the shooter need to be reconfigured so that we can test shooting in autonomous
Merge pull request #50 from swarage/master

Lift and shoot