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'
Added ProgressView to the game
Merge branch 'master' into progressview

Conflicts:
	SilkRoad/StageController.m
Added merged changes from master to StageController
Finished merging all changes from master, removed a warning
fix issue with everyone saying 'hello traveler', update some dialogue
Removed unnecessary method moveToNextStage
Merge pull request #12 from zsweedyk/progressview

Added the ProgressView
Merge pull request #13 from zsweedyk/dialogueUpdate

fix issue with everyone saying 'hello traveler', update some dialogue
Merge branch 'master' into dialogueUpdates

Conflicts:
	SilkRoad/Dialogue00.txt
	SilkRoad/Dialogue04.txt
	SilkRoad/Dialogue14.txt
	SilkRoad/Dialogue20.txt