Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement

Conflicts:
	controllers/bonfire.js
This commit is contained in:
Michael Q Larson
2015-01-21 15:37:14 -08:00
8 changed files with 433 additions and 315 deletions

View File

@@ -1,5 +1,5 @@
var _ = require('lodash'),
debug = require('debug')('freecc:cntr:bonfires');
debug = require('debug')('freecc:cntr:bonfires');
// bonfire = require('./../models/Bonfire');
/**
@@ -7,6 +7,7 @@ var _ = require('lodash'),
*/
exports.index = function(req, res) {
res.render('bonfire/bonfire.jade', {
title: 'Learn to code with Bonfire - Free Code Camp'
});
//Bonfire.find({}, null, { sort: { bonfireNumber: 1 } }, function(err, c) {
// if (err) {