Steven is better. .gitignore might actually leave this time.
Merge branch 'master' of https://github.com/jeffcasavant/textgame

Conflicts:
	steven

I combined the two. Even though mine was better.