Merge branch 'master' into Dunn_Works
Credits and Special Thanks
Uncommented everything
Comments
fixed damage stuff
Merge branch 'Dunn_Works'

Conflicts:
	Text Adventure/src/Game.java
Merge branch 'Geoffs_WIP'
Merge branch 'master' into Geoffs_WIP