Merge branch 'master' of github.com:sethwoodworth/FinalsClub

diff --git a/.gitmodules b/.gitmodules
index 46e94e308dc9e1cc30ffb3cac1ee29e89b27c969..c784a449f4c87e65e9e085e265fb1011148f2c25 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "etherpad-lite"]
        path = etherpad-lite
        url = https://github.com/chapel/etherpad-lite
+[submodule "bc"]
+       path = bc
+       url = https://github.com/finalsclubdev/bc.git

diff --git a/app.js b/app.js
index 60871714762747ac6eb809f369c2991c2d8c0b56..721d3978a5d54bf92c1c5b1df7c6c4227ca62854 100644 (file)
--- a/app.js
+++ b/app.js
@@ -22,7 +22,7 @@ var hat                                       = require('hat');
 var connect                    = require( 'connect' );
 var Session                    = connect.middleware.session.Session;
 var parseCookie = connect.utils.parseCookie;
-var Backchannel = require('../bc/backchannel');
+var Backchannel = require('./bc/backchannel');
 
 // Depracated
 // Used for initial testing

diff --git a/bc b/bc
new file mode 160000 (submodule)
index 0000000..3ee3af3
--- /dev/null
+++ b/bc
@@ -0,0 +1 @@
+Subproject commit 3ee3af3ffc3d0cca4453bf3a4c79e399a803fa51