working on combat
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hw5/Game.java
Merge remote-tracking branch 'origin/master'