proper transition for conversation
Merge branch 'master' of github.com:Robmaister/DayDream

Conflicts:
	DayDream/daydream/src/talk_minigame/conversation.js