Merge pull request #6 from zsweedyk/map

Map
Houses become desaturated when visited
Merge pull request #7 from zsweedyk/visitedhouses

Houses become desaturated when visited
Updated scales game to fix bugs and simplify
New dialogue system works properly.
Merge pull request #8 from zsweedyk/dialogueRefactor

New dialogue system works properly.
Updated view and added guess limit

Updated ScalesGameView to center the coin in the fake coin bucket,
added a limit to the number of guesses someone can make before a new
set of coins is given
Merge pull request #9 from zsweedyk/simple-scales

Simplified scales game
add reset puzzle and new puzzle buttons to road game
Merge pull request #10 from zsweedyk/roadButtons

add reset puzzle and new puzzle buttons to road game
Fixed InteriorTests and added to ScalesGame

Commented out old functions in InteriorTests and added the last part of
the scales game (identifying if the guessed coin is heavier or lighter
than the others)
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'
Added ProgressView to the game
Merge branch 'master' into progressview

Conflicts:
	SilkRoad/StageController.m
Added merged changes from master to StageController