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

Conflicts:

TextAdventure.xcodeproj/project.xcworkspace/xcshareddata/TextAdventure.x
ccheckout