fixed logic in pkhand
Merge remote-tracking branch 'origin/master'

Conflicts:
	Proj1_CS342/src/game_res/Enemy.java
	Proj1_CS342/src/launcher/Game.java