From 96abfc3d09e06a68cfde5fabe8fe7a23488a80e7 Mon Sep 17 00:00:00 2001
From: teonlamont <teon.brooks@gmail.com>
Date: Sun, 27 Dec 2015 20:39:09 -0500
Subject: [PATCH] Update dependencies, RM git submodule

---
 .gitmodules              | 3 ---
 client/externals/jsPsych | 1 -
 package.json             | 4 +++-
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 160000 client/externals/jsPsych

diff --git a/.gitmodules b/.gitmodules
index a311a94..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "client/externals/jsPsych"]
-	path = client/externals/jsPsych
-	url = https://github.com/teonlamont/jsPsych.git
diff --git a/client/externals/jsPsych b/client/externals/jsPsych
deleted file mode 160000
index 8f0a118..0000000
--- a/client/externals/jsPsych
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f0a1186b9cb164df22d016d6e2d73687a7175fd
diff --git a/package.json b/package.json
index bf8b9ee..a2c8dc8 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,8 @@
     "babel": "^6.3.13",
     "bootstrap": "^3.3.6",
     "gulp": "^3.9.0",
-    "jquery": "^2.1.4"
+    "openbci-sdk": "0.1.0",
+    "jquery": "^2.1.4",
+    "jspsych": "git://github.com/teonlamont/jsPsych.git#590313c2fc528c147a5d6040f001c7407ee3623b"
   }
 }