fixed shot
fixed

Conflicts:
	Player.java
	Save.class
	Shot.java
	Turret.java
	enemyClass.java
fixed
Merge branch 'master' of https://github.com/ensign-redshirt/Zombie