fixing bug in reset road game method
fixed bugs where the game segfaults after you win and where you can play a minigame without having talked to everyone in the town.
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'
Merge branch 'master' into progressview

Conflicts:
	SilkRoad/StageController.m