Fixed compile errors
minor misc stuff
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	shooter.h