Merge branch 'timestamp' into challenges

Conflicts:
	config/passport.js
	public/css/main.less

controllers/user.js

@@ -5,6 +5,7 @@ var nodemailer = require('nodemailer');
 var passport = require('passport');
 var User = require('../models/User');
 var secrets = require('../config/secrets');
+var moment = require('moment');
 
 /**
  * GET /login
@@ -130,7 +131,9 @@ exports.postEmailSignup = function(req, res, next) {
 
 exports.getAccount = function(req, res) {
   res.render('account/profile', {
-    title: 'Manage your Free Code Camp Account'
+    title: 'Manage your Free Code Camp Account',
+    cc: req.user.challengesHash,
+    moment: moment
   });
 };