Merge branch 'dev'

Conflicts:
	app.js
	router.js

1 files changed, 25 insertions, 0 deletions

diff --git a/config/config.js b/config/config.js
new file mode 100644
index 0000000..50dea23
--- /dev/null
+++ b/config/config.js
@@ -0,0 +1,25 @@
+var path = require('path')
+  , rootPath = path.normalize(__dirname + '/..');
+
+
+module.exports = {
+    development: {
+        db: 'mongodb://localhost/test',
+        root: rootPath,
+        app: {
+            name: 'Divid'
+        },
+        facebook: {
+            clientID: "504825706245603",
+            clientSecret: "e5ea0faed85d8749cafd38732530ef35",
+            callbackURL: "https://divid.no/auth/facebook/callback"
+        },
+        twitter: {
+            clientID: "tpCfKBUyAfogTpFxnb9w",
+            clientSecret: "abzInK4Nu0IFUhyXl73O2XjlFLFlzmBtLmbXk6v8",
+            callbackURL: "https://divid.no/auth/twitter/callback"
+        }
+    }
+}
+
+