Change4
Merge branch 'master' of https://github.com/jackskis/TextAdventure

Conflicts:
	TextAdventure/main.cpp