fixed conflict in index about menu

index.html

@@ -160,7 +160,7 @@ Through the map, we give shape to a common context in Turkish culture. The map a
   </div>
 </div>
 
-           
+
 </div>
 </div>
 

static/css/style.css

@@ -475,8 +475,13 @@ font-size: 16px;
     position: absolute;
   right: 50px;
   top:30px;
+<<<<<<< HEAD
+}
+*/
+=======
 }*/
 
+>>>>>>> a4c562a74b0d98a69fcba45d31accdddf753cd2e
 
 #about a {
 text-decoration: none;

static/js/d3_map.js

@@ -8,8 +8,8 @@ var svg = d3.select(".map_area").append("svg")
 
 var force = d3.layout.force()
   .gravity(0.008)
-  .distance(180)
-  .charge(-35)
+  .distance(190)
+  .charge(-55)
   .size([width, height]);