Merge branch 'master' into Dunn_Works
fixed damage stuff
Merge branch 'Dunn_Works'

Conflicts:
	Text Adventure/src/Game.java