Zombies attack! and Turrets return fire!
Merge branch 'master' of https://github.com/JSybrandt/SootAndSickle

Conflicts:
	SootNSickle/SootNSickle/constants.h
	SootNSickle/SootNSickle/sootnsickle.h