diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index aaed9c7..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-
-*.xml
-
-*.properties
diff --git a/html5-logo_250.png b/html5-logo_250.png
deleted file mode 100644
index 9c02fa8..0000000
Binary files a/html5-logo_250.png and /dev/null differ
diff --git a/main.html b/main.html
index 5d96f57..eb1ff1e 100644
--- a/main.html
+++ b/main.html
@@ -3,11 +3,8 @@
   <head>
     <meta charset=utf-8 />
     <title>ToDo List - WebSQL To IndexedDB Live Example</title>
-    <meta name="description" content="WebSQL To IndexedDB Live Example - last updated: May 2012">
-    <meta name="author" content="Ido Green">
   </head>
   <style>
-<<<<<<< HEAD
 /* TODO - C'mon... move it to a css file
 Containers
 ----------------------------------------------------------------------------------------------------*/
@@ -16,163 +13,144 @@
 	margin-left: 4%;
 	margin-right: 4%;
 }
-=======
 
-    /*
-      Variable Grid System (Fluid Version).
-      Learn more ~ http://www.spry-soft.com/grids/
-      Based on 960 Grid System - http://960.gs/ & 960 Fluid - http://www.designinfluences.com/
-    
-      Licensed under GPL and MIT.
-    */
-
-
-    /* Containers
-    ----------------------------------------------------------------------------------------------------*/
-    .container_3 {
-      width: 92%;
-      margin-left: 4%;
-      margin-right: 4%;
-    }
->>>>>>> fix the version upgrade to work both on Chrome and FF
-
-    /* Grid >> Global
-    ----------------------------------------------------------------------------------------------------*/
-
-    .grid_1,
-    .grid_2,
-    .grid_3 {
-      display:inline;
-      float: left;
-      position: relative;
-      margin-left: 1%;
-      margin-right: 1%;
-    }
+/* Grid >> Global
+----------------------------------------------------------------------------------------------------*/
 
-    /* Grid >> Children (Alpha ~ First, Omega ~ Last)
-    ----------------------------------------------------------------------------------------------------*/
+.grid_1,
+.grid_2,
+.grid_3 {
+	display:inline;
+	float: left;
+	position: relative;
+	margin-left: 1%;
+	margin-right: 1%;
+}
 
-    .alpha {
-      margin-left: 0;
-    }
+/* Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
 
-    .omega {
-      margin-right: 0;
-    }
+.alpha {
+	margin-left: 0;
+}
 
-    /* Grid >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
+.omega {
+	margin-right: 0;
+}
 
+/* Grid >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .grid_1 {
-      width:31.333%;
-    }
 
-    .container_3 .grid_2 {
-      width:64.667%;
-    }
+.container_3 .grid_1 {
+	width:31.333%;
+}
 
-    .container_3 .grid_3 {
-      width:98.0%;
-    }
+.container_3 .grid_2 {
+	width:64.667%;
+}
 
+.container_3 .grid_3 {
+	width:98.0%;
+}
 
 
-    /* Prefix Extra Space >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
 
+/* Prefix Extra Space >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .prefix_1 {
-      padding-left:33.333%;
-    }
 
-    .container_3 .prefix_2 {
-      padding-left:66.667%;
-    }
+.container_3 .prefix_1 {
+	padding-left:33.333%;
+}
 
+.container_3 .prefix_2 {
+	padding-left:66.667%;
+}
 
 
-    /* Suffix Extra Space >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
 
+/* Suffix Extra Space >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .suffix_1 {
-      padding-right:33.333%;
-    }
 
-    .container_3 .suffix_2 {
-      padding-right:66.667%;
-    }
+.container_3 .suffix_1 {
+	padding-right:33.333%;
+}
 
+.container_3 .suffix_2 {
+	padding-right:66.667%;
+}
 
 
-    /* Push Space >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
 
+/* Push Space >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .push_1 {
-      left:33.333%;
-    }
 
-    .container_3 .push_2 {
-      left:66.667%;
-    }
+.container_3 .push_1 {
+	left:33.333%;
+}
 
+.container_3 .push_2 {
+	left:66.667%;
+}
 
 
-    /* Pull Space >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
 
+/* Pull Space >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .pull_1 {
-      left:-33.333%;
-    }
 
-    .container_3 .pull_2 {
-      left:-66.667%;
-    }
+.container_3 .pull_1 {
+	left:-33.333%;
+}
 
+.container_3 .pull_2 {
+	left:-66.667%;
+}
 
 
 
-    /* Clear Floated Elements
-    ----------------------------------------------------------------------------------------------------*/
 
-    /* http://sonspring.com/journal/clearing-floats */
+/* Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
 
-    .clear {
-      clear: both;
-      display: block;
-      overflow: hidden;
-      visibility: hidden;
-      width: 0;
-      height: 0;
-    }
+/* http://sonspring.com/journal/clearing-floats */
 
-    /* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
+.clear {
+	clear: both;
+	display: block;
+	overflow: hidden;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
 
-    .clearfix:after {
-      clear: both;
-      content: ' ';
-      display: block;
-      font-size: 0;
-      line-height: 0;
-      visibility: hidden;
-      width: 0;
-      height: 0;
-    }
+/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
+
+.clearfix:after {
+	clear: both;
+	content: ' ';
+	display: block;
+	font-size: 0;
+	line-height: 0;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
 
-    .clearfix {
-      display: inline-block;
-    }
+.clearfix {
+	display: inline-block;
+}
 
-    * html .clearfix {
-      height: 1%;
-    }
+* html .clearfix {
+	height: 1%;
+}
 
-    .clearfix {
-      display: block;
-    }
+.clearfix {
+	display: block;
+}
   </style>
   <body>
 
diff --git a/notes.html b/notes.html
deleted file mode 100644
index 80792eb..0000000
--- a/notes.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-<script>
-var db;
-
-// https://developer.mozilla.org/en/IndexedDB/Using_IndexedDB
-var indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB || window.msIndexedDB;
-var IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction;
-
-function init() {
-  var dbVersion = 1.0;
-  var openRequest = indexedDB.open("notesDB", dbVersion);
-
-    //handle setup
-    openRequest.onupgradeneeded = function(e) {
-
-      console.log("running onupgradeneeded");
-      var thisDb = e.target.result;
-
-      //temp delete
-      //thisDb.deleteObjectStore("note");
-
-      //Create Note
-      if(!thisDb.objectStoreNames.contains("note")) {
-        console.log("I need to make the note objectstore");
-        var objectStore = thisDb.createObjectStore("note", { keyPath: "id", autoIncrement:true });  
-        objectStore.createIndex("title", "title", { unique: false });
-      }
-
-
-    }
-
-    openRequest.onsuccess = function(e) {
-      db = e.target.result;
-
-      db.onerror = function(event) {
-        // Generic error handler for all errors targeted at this database's
-        // requests!
-        alert("Database error: " + event.target.errorCode);
-        console.dir(event.target);
-      };
-        // Interim solution for Google Chrome to create an objectStore. Will be deprecated
-        if (db.setVersion) {
-          console.log("in old setVersion: "+ db.setVersion);
-            if (db.version != dbVersion) {
-                var req = db.setVersion(dbVersion);
-                req.onsuccess = function () {
-                    var ob = db.createObjectStore("note", { keyPath: "id", autoIncrement:true });  
-                    ob.createIndex("title", "title", { unique: false });
-                    var trans = req.result;
-                    trans.oncomplete = function(e) {
-                      console.log("== trans oncomplete ==");
-                      displayNotes();
-                    }
-                };
-            }
-            else {
-                displayNotes();
-            }
-        }
-        else {
-            displayNotes();
-        }
-
-    }
-
-    function displayNotes() {
-      console.log("TODO - print something nice on the page");
-    }
-
-    //TEMP TO REMOVE
-    document.querySelector("#test").addEventListener("click", function() {
-
-      var transaction = db.transaction(["note"], "readwrite");  
-
-      transaction.oncomplete = function(event) {
-          console.log("All done!");
-      };
-
-      transaction.onerror = function(event) {
-        // Don't forget to handle errors!
-        console.dir(event);
-      };
-
-      var objectStore = transaction.objectStore("note");
-      //use put versus add to always write, even if exists
-      var request = objectStore.add({title:"note 1",body:"this is the body "+Math.floor(Math.random()*1000)});
-
-      request.onsuccess = function(event) {
-        console.log("done with insert");
-      };
-
-
-      objectStore.openCursor().onsuccess = function(event) {  
-        var cursor = event.target.result;  
-        if (cursor) {  
-          console.log(cursor.key);
-          console.dir(cursor.value);
-          cursor.continue();  
-        }  
-        else {  
-          console.log("Done with cursor");
-        }  
-      };  
-
-    });
-}
-</script>
-</head>
-
-<body onload="init()">
-
-  <button id="test">Test</button>
-</body>
-</html>
\ No newline at end of file
diff --git a/test-onupgrade.html b/test-onupgrade.html
deleted file mode 100644
index 7b4bc6a..0000000
--- a/test-onupgrade.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html>
-  <head>
-    <script>
-
-      var indexedDB = window.indexedDB || window.webkitIndexedDB 
-                    ||window.mozIndexedDB||window.msIndexedDB;
-
-      var request = indexedDB.open("testUpgrade",1);    
-      var customerData=[
-        {tel:"540-343-3334",name:"Monk",age:35,email:"mock@example.com"},      
-        {tel:"650-450-5555",name:"Jack",age:32,email:"jack-2@example.com"}
-      ];
-
-      request.onerror = function(e){
-         alert("Oppss... we got into problems and errors. e:"+e);
-      };
-      
-      request.onupgradeneeded = function(event) {
-         alert("UPGRADE our nice DB") ;
-         var objectStore = db.createObjectStore("customers",{keyPath:"ssn"});
-         objectStore.createIndex("name","name",{unique:false});
-         objectStore.createIndex("email","email",{unique:true});
-
-         for(var i in customerData){
-            objectStore.add(customerData[i]);
-         }
-      };
-      
-      request.onsuccess = function(e) {
-         alert("life is good with indexedDB e:"+e) ;
-      };
-      
-    </script>
-  </head>
-</html>
\ No newline at end of file
diff --git a/todo-indexedDB-example.html b/todo-indexedDB-example.html
index ab311fc..be8fec4 100644
--- a/todo-indexedDB-example.html
+++ b/todo-indexedDB-example.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html>
-<<<<<<< HEAD
   <head>
     <meta charset=utf-8 />
     <title>ToDo List with IndexedDB</title>
@@ -8,18 +7,6 @@
       var READ_WRITE = 'readwrite';
       var READ_ONLY = 'readonly';
       var dbName = "todo2";
-=======
-<head>
-  <meta charset=utf-8 />
-  <title>ToDo List with IndexedDB</title>
-  <meta name="description" content="WebSQL To IndexedDB Live Example - last updated: May 2012">
-  <meta name="author" content="Ido Green">
-
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
-  <script>
-      var dbName = "todo3";
-      var dbVersion = 2.0;
->>>>>>> fix the version upgrade to work both on Chrome and FF
       var todoDB = {};
       var indexedDB = window.indexedDB || window.webkitIndexedDB ||
         window.mozIndexedDB;
@@ -37,14 +24,12 @@
       };
 
       todoDB.indexedDB.open = function() {
-        var request = indexedDB.open(dbName, dbVersion);
+        var request = indexedDB.open(dbName);
 
         request.onsuccess = function(e) {
-          // Old api: var v = "2-beta"; 
-          console.log ("success to open DB: " + dbName);
+          var v = "2.0 beta"; // yes! you can put strings in the version not just numbers
           todoDB.indexedDB.db = e.target.result;
           var db = todoDB.indexedDB.db;
-<<<<<<< HEAD
 
           // We can only create Object stores in a setVersion transaction;
           if (v!= db.version) {
@@ -67,61 +52,17 @@
                 todoDB.indexedDB.getAllTodoItems();
               }
             };
-=======
-          if (db.setVersion) {
-            console.log("in old setVersion: "+ db.setVersion);
-              if (db.version != dbVersion) {
-                  var req = db.setVersion(dbVersion);
-                  req.onsuccess = function () {
-                    if(db.objectStoreNames.contains("todo")) {
-                      db.deleteObjectStore("todo");
-                    }
-
-                    var store = db.createObjectStore("todo", {keyPath: "timeStamp"});
-
-                    var trans = req.result;
-                    trans.oncomplete = function(e) {
-                      console.log("== trans oncomplete ==");
-                      todoDB.indexedDB.getAllTodoItems();
-                    }
-                  };
-              }
-              else {
-                  todoDB.indexedDB.getAllTodoItems();
-              }
->>>>>>> fix the version upgrade to work both on Chrome and FF
           }
           else {
-              todoDB.indexedDB.getAllTodoItems();
-          }
-
-        }
-        
-        request.onupgradeneeded = function(e) {
-          console.log ("going to upgrade our DB!");
-          
-          todoDB.indexedDB.db = e.target.result;
-          var db = todoDB.indexedDB.db;
-          if(db.objectStoreNames.contains("todo")) {
-            db.deleteObjectStore("todo");
+            todoDB.indexedDB.getAllTodoItems();
           }
-
-          var store = db.createObjectStore("todo",
-          {keyPath: "timeStamp"});
-
-          todoDB.indexedDB.getAllTodoItems();
-        }
-       
+        };
         request.onfailure = todoDB.indexedDB.onerror;
-      };
+      }
 
       todoDB.indexedDB.addTodo = function(todoText) {
         var db = todoDB.indexedDB.db;
-<<<<<<< HEAD
         var trans = db.transaction(['todo'], READ_WRITE);
-=======
-        var trans = db.transaction(['todo'], "readwrite");
->>>>>>> fix the version upgrade to work both on Chrome and FF
         var store = trans.objectStore("todo");
 
         var data = {
@@ -142,11 +83,7 @@
 
       todoDB.indexedDB.deleteTodo = function(id) {
         var db = todoDB.indexedDB.db;
-<<<<<<< HEAD
         var trans = db.transaction(["todo"], READ_WRITE);
-=======
-        var trans = db.transaction(["todo"], "readwrite");
->>>>>>> fix the version upgrade to work both on Chrome and FF
         var store = trans.objectStore("todo");
 
         var request = store.delete(id);
@@ -165,11 +102,7 @@
         todos.innerHTML = "";
 
         var db = todoDB.indexedDB.db;
-<<<<<<< HEAD
         var trans = db.transaction(["todo"], READ_WRITE);
-=======
-        var trans = db.transaction(["todo"], "readwrite");
->>>>>>> fix the version upgrade to work both on Chrome and FF
         var store = trans.objectStore("todo");
 
         // Get everything in the store;
@@ -245,7 +178,7 @@
       });
 
     </script>
-  <style>
+    <style>
       #ourList {
         background: lightcyan;
         padding: 25px;
@@ -263,7 +196,6 @@
         width: 250px;
       }
     </style>
-<<<<<<< HEAD
   </head>
   <body>
     <h1>ToDo list - IndexedDB Example</h1>
@@ -279,17 +211,3 @@ <h3>Todos</h3>
     </div>
   </body>
 </html>
-=======
-</head>
-<body>
-  <h1>ToDo list - IndexedDB Example</h1>
-  <ul id="todoItems"></ul>
-  <input type="text" id="todo" name="todo" placeholder="What do you need to do?" />
-  <input type="submit" value="Add Todo Item" onclick="addTodo(); return false;" />
-
-  <h3>Todos</h3>
-  <input type="submit" value="Show All Todos" onclick="showAll(); return false;" />
-  <div id="ourList"></div>
-</body>
-</html>
->>>>>>> fix the version upgrade to work both on Chrome and FF
diff --git a/todo-webSQL-example.html b/todo-webSQL-example.html
index 86158dc..27feefa 100644
--- a/todo-webSQL-example.html
+++ b/todo-webSQL-example.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Todo in webSQL</title>
-    <meta name="description" content="WebSQL To IndexedDB Live Example - last updated: May 2012">
     <meta name="author" content="Ido Green">
     <script src="http://code.jquery.com/jquery.min.js" ></script>
 
@@ -90,7 +89,7 @@ <h3>Todos</h3>
         });
       }
      
-      function deleteTodo(id, text) {
+     function deleteTodo(id, text) {
         if (confirm("Are you sure you want to Delete "+ text +"?")) {
           database.transaction(function(tx) {
             tx.executeSql('DELETE FROM tasks WHERE id=?', [id]); 
