playing with google maps coloring
resolving merge conflicts