From f50ddc7b39690eaaf36fe8a39b3f4e3a06be6eb0 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Mon, 27 Jul 2015 14:08:36 -0700
Subject: [PATCH] fixed sessions error

---
 config/config.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/config.js b/config/config.js
index b578d716..328a57f0 100755
--- a/config/config.js
+++ b/config/config.js
@@ -12,17 +12,17 @@ var _ = require('lodash'),
 /**
  * Load app configurations
  */
-if( fs.existsSync('./env/api_keys.js') ){
-	module.exports = _.extend(
-		require('./env/all'),
-		require('./env/' + process.env.NODE_ENV) || {},
-		require('./env/api_keys') || {}
-	);
-}else {
-	module.exports = _.extend(
+ var exports = _.extend(
 		require('./env/all'),
 		require('./env/' + process.env.NODE_ENV) || {}
 	);
+if( fs.existsSync('./env/api_keys.js') ){
+	module.exports = _.merge(
+		exports,
+		require('./env/api_keys') || {}
+	);
+}else {
+	module.exports = exports;
 }