Fixed logic.
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	Shooter.cpp
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014