Made player displayable
Merge remote-tracking branch 'origin/master'

Conflicts:
	too_many_cooks/__init__.py
	too_many_cooks/globals.py
	too_many_cooks/player.py