whole buncha stuff
Merge branch 'master' of https://github.com/stuartsoft/NinjaGhost

Conflicts:
	ninjaGhost.cpp
guard shooting