Dialogue on it's way
Merge remote-tracking branch 'origin/master'

Conflicts:
	game.py
	image.py
	player.py