fix conflict

Author: Philippe BARBOSA

img/PythonDScover.png

@@ -1,4 +1,22 @@
 { "books" : [
+    {
+        "title": "How to Think Like a Computer Scientist: Interactive Edition",
+        "author": "Brad Miller, David Ranum, Jeffrey...",
+        "authorUrl": "http://reputablejournal.com",
+        "level": "Beginner",
+        "info": "This interactive book teaches you Python the interactive way, right in the browser.",
+        "url": "http://interactivepython.org/courselib/static/thinkcspy/index.html",
+        "cover": "img/runestone.png"
+    },
+    {
+        "title": "Problem Solving with Algorithms and Data Structures Using Python",
+        "author": "Bradley Miller and David Ranum",
+        "authorUrl": "http://reputablejournal.com/",
+        "level": "Intermediate",
+        "info": "This book is a CS2 data structures textbook, with a review of Python concepts in chapter 1",
+        "url": "http://interactivepython.org/courselib/static/pythonds/index.html",
+        "cover": "img/PythonDScover.png"
+    },
     {
         "title": "Learn Python The Hard Way",
         "author": "Zed A. Shaw",
@@ -27,7 +45,7 @@
         "cover": "img/cover_divepython3.jpg"
     },
     {
-        "title": "How to Think Like a Computer Scientist",
+        "title": "Think Python",
         "author": "Allen B. Downey",
         "authorUrl": "http://www.greenteapress.com/",
         "level": "Beginner",