Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Fixed Conflicts, some bugs

lockhart wtf
Merge branch 'Geoffs_WIP'
conflicts are gone probably idk

thanks dunn
merge into ma branch

hyup
Conflicts?

The Neville Chamberlain of github
Merge branch 'master' into Geoffs_WIP

Conflicts:
	Text Adventure/src/Game.java
	Text Adventure/src/Player.java
Trying Something

dont yell
Merge branch 'master' into Geoffs_WIP
Finally no conflicts

wtf alreadu
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
Merge branch 'master' into Geoffs_WIP
moved help to a separate method, added fight loop (may need changed later)
Merge branch 'master' into Geoffs_WIP
Revert "moved help to a separate method, added fight loop (may need changed later)"

This reverts commit 797903608706bb3661bd2429185c69e5f37c842f.