Changed prompts
Merge branch 'master' of https://github.com/amuskens/tycoon

Conflicts:
	game.py
Merge remote-tracking branch 'origin/master'