merge completed... now to fix all the bugs...

node_modules/text-table/package.json

@@ -0,0 +1,44 @@
+{
+    "name": "text-table",
+    "version": "0.2.0",
+    "description": "borderless text tables with alignment",
+    "main": "index.js",
+    "devDependencies": {
+        "tap": "~0.4.0",
+        "tape": "~1.0.2",
+        "cli-color": "~0.2.3"
+    },
+    "scripts": {
+        "test": "tap test/*.js"
+    },
+    "testling" : {
+        "files" : "test/*.js",
+        "browsers" : [
+            "ie/6..latest",
+            "chrome/20..latest",
+            "firefox/10..latest",
+            "safari/latest",
+            "opera/11.0..latest",
+            "iphone/6", "ipad/6"
+        ]
+    },
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/substack/text-table.git"
+    },
+    "homepage": "https://github.com/substack/text-table",
+    "keywords": [
+        "text",
+        "table",
+        "align",
+        "ascii",
+        "rows",
+        "tabular"
+    ],
+    "author": {
+        "name": "James Halliday",
+        "email": "mail@substack.net",
+        "url": "http://substack.net"
+    },
+    "license": "MIT"
+}