added Mocha Test

serverTest/routes/index.js

@@ -3,15 +3,8 @@ var router = express.Router();
 var db = require('../dataBaseQuery');
 
 router.get('/', function(req, res) {
-<<<<<<< HEAD
   var dateString = req.query.date;
   var now;
-
-=======
-  var time0 = process.hrtime();
-  var dateString = req.query.date;
-  var now;
->>>>>>> d442b22ed5b85e32a7f64e41db568ef54331f6ac
   if(dateString && dateString.length == 8) {
     var year = parseInt(dateString.slice(0,4));
     var month = parseInt(dateString.slice(4,6));
@@ -22,10 +15,7 @@ router.get('/', function(req, res) {
     now = new Date();
   }
 
-<<<<<<< HEAD
   var time0 = process.hrtime();
-=======
->>>>>>> d442b22ed5b85e32a7f64e41db568ef54331f6ac
   db.getData(now, function(result) {
     res.render('index', { body: result });
     var time1 = process.hrtime(time0);

test/dateViewTest.js

@@ -7,11 +7,7 @@ var now = new Date(2014, 4, 1);
 
 dateArray.setEpocheSpan(dateView.getPropperEpochSpan(now));
 
-<<<<<<< HEAD
-var data = dateArray.getData(require('././testHof.json'));
-=======
-var data = dateArray.getData(require('./testData/testHof.json'));
->>>>>>> d442b22ed5b85e32a7f64e41db568ef54331f6ac
+var data = dateArray.getData(require('../mochaTests/testData/testHof.json'));
 console.log(data);
 var view = dateView.getView(data, now, 0);