Textbox tweaks
Merge branch 'master' of https://github.com/DiscoBizzle/Ghost-Simulator

Conflicts:
	gslib/game.py
merge conflict resolution
Merge branch 'master' of https://github.com/DiscoBizzle/Ghost-Simulator