/* 
* @Author: justinwebb
* @Date:   2015-05-28 22:46:32
* @Last Modified by:   kuychaco
* @Last Modified time: 2015-06-01 16:58:45
*/

'use strict';
var express = require('express');
var app = express();
var server = require('http').createServer(app);
var config = require('./server-config');
var utils = require('../lib/utils');
var db = require('./database/db');

app.use(express.static(config.dist));

server.listen(config.port, function () {
  var host = server.address().address;
  var port = server.address().port;
  var project = utils.grandParentDir(__dirname, true);
  console.log(project + ' is online at http://localhost:'+port, host, port);
  // console.log(project + ' is online at http://%s:%s', host, port);
  console.log('Created client to', db.database, 'database');
});

/* 
* @Author: justinwebb
* @Date:   2015-05-28 22:46:32
* @Last Modified by:   kuychaco
* @Last Modified time: 2015-06-02 19:18:39
*/

'use strict';
var express = require('express');
var app = express();
var server = require('http').createServer(app);
var config = require('./server-config');
var utils = require('../lib/utils');
var db = require('./database/db');

app.use(express.static(config.dist));

server.listen(config.port, function () {
  var host = server.address().address;
  var port = server.address().port;
  var project = utils.grandParentDir(__dirname, true);
  console.log(project + ' is online at http://localhost:'+port, host, port);
  // console.log(project + ' is online at http://%s:%s', host, port);
  console.log('Created client to', db.database, 'database');
});

Fix merge conflict