Fix merge conflicts

Author: driverdan

lib/XMLHttpRequest.js

@@ -440,6 +440,14 @@ exports.XMLHttpRequest = function() {
     this.readyState = this.UNSENT;
   };
 
+  var listeners = {};
+  this.addEventListener = function(event, callback) {
+    if (!(event in listeners)) {
+      listeners[event] = [];
+    }
+    listeners[event].push(callback);
+  };
+
   /**
    * Changes readyState and calls onreadystatechange.
    *
@@ -450,5 +458,12 @@ exports.XMLHttpRequest = function() {
     if (typeof self.onreadystatechange === "function") {
       self.onreadystatechange();
     }
+
+    if ("readystatechange" in listeners) {
+      var count = listeners["readystatechange"].length, i = 0;
+      for(; i < count; i++) {
+        listeners["readystatechange"][i].call(self);
+      }
+    }
   };
 };

package.json

@@ -6,7 +6,7 @@
     "name": "Dan DeFelippi"
     , "url": "http://driverdan.com"
   }
-, "keywords" ["xhr", "ajax"]
+, "keywords": ["xhr", "ajax"]
 , "licenses": [{
     "type": "MIT"
     , "url": "http://creativecommons.org/licenses/MIT/"