Ratstail91/Text-Based-Adventure — pull request #4 by cjbrowne (2012-11-09 19:16:54+00:00)
Title: Fixing some git mishaps from earlier

Something went wrong somewhere along the line and I think people got a bit confused. I'm going to auto-merge this pull request because it should bring the repo back up to date with all the changes made.