Merge origin/master

Conflicts:
	zombieHunting/src/byui/cit260/zombiesHunting/control/GameControl.java