purple and green map with sanfran and tokyo
merge conflict resolved