display transitionary dialogue between matching game and fun game
Merge branch 'master' into minigameTransitions

Conflicts:
	SilkRoad/Dialogue30.txt
	SilkRoad/InteriorController.m
whoops
Merge branch 'minigameTransitions'