Map is working, need to add a button for it to the stage view
adding more road puzzles
moving code from viewDidAppear to viewDidLoad
changing display methods to not create new navigation controllers
now have implemented a jump to stage method but need to work out the bugs
added art for china stage 3 and india stage 3, clarified character gender, added art for desaturated house, and got the map working. The jump to stage method isnt working so now you can only go back to the stage you were on
Have an MVP for Scales Game and a global constants file
Merge pull request #3 from zsweedyk/map

Map + new art
Merge pull request #5 from zsweedyk/scalesgame

Have an MVP for Scales Game and a global constants file
Added Constants.h/.m files to project
Modified ScalesGameTests to use public methods and fixed a typo that caused the Indian Village Elder not to sure up
moving setting character images out of progress dialogue, temporarily add in road game to stage 2
Minor bug fix -- return to Village button on stage 3 now works
so merging
fixed merge conflicts
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
Should stop complaining about merge conflicts now.