From c17ff59aef7d3155ea733b0735df3c0c95c3e862 Mon Sep 17 00:00:00 2001
From: jameskopacz <jameskopacz@users.noreply.github.com>
Date: Wed, 25 Mar 2015 20:43:11 -0500
Subject: [PATCH 01/24] Handle callback errors for user, bonfire, challenges,
 courseware, and resources controllers

---
 controllers/bonfire.js    | 53 +++++++++++++++++++++------------------
 controllers/challenges.js |  4 +--
 controllers/courseware.js | 16 ++++++------
 controllers/resources.js  |  4 ++-
 controllers/user.js       | 18 +++++++------
 5 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/controllers/bonfire.js b/controllers/bonfire.js
index 83431a390d4..2fe914df9d8 100644
--- a/controllers/bonfire.js
+++ b/controllers/bonfire.js
@@ -35,7 +35,7 @@ exports.index = function(req, res) {
     });
 };
 
-exports.returnNextBonfire = function(req, res) {
+exports.returnNextBonfire = function(req, res, next) {
     if (!req.user) {
         return res.redirect('../bonfires/meet-bonfire');
     }
@@ -48,24 +48,24 @@ exports.returnNextBonfire = function(req, res) {
             return elem;
         }
     });
-    req.user.save();
-
-    var uncompletedBonfires = req.user.uncompletedBonfires;
-
-    var displayedBonfires =  Bonfire.find({'_id': uncompletedBonfires[0]});
-    displayedBonfires.exec(function(err, bonfire) {
-        if (err) {
-            next(err);
-        }
-        bonfire = bonfire.pop();
-        if (bonfire === undefined) {
-            req.flash('errors', {
-                msg: "It looks like you've completed all the bonfires we have available. Good job!"
-            });
-            return res.redirect('../bonfires/meet-bonfire');
-        }
-        nameString = bonfire.name.toLowerCase().replace(/\s/g, '-');
-        return res.redirect('../bonfires/' + nameString);
+    req.user.save(function(err) {
+        if (err) return next(err);
+        var uncompletedBonfires = req.user.uncompletedBonfires;
+        var displayedBonfires =  Bonfire.find({'_id': uncompletedBonfires[0]});
+        displayedBonfires.exec(function(err, bonfire) {
+            if (err) {
+                return next(err);
+            }
+            bonfire = bonfire.pop();
+            if (bonfire === undefined) {
+                req.flash('errors', {
+                    msg: "It looks like you've completed all the bonfires we have available. Good job!"
+                });
+                return res.redirect('../bonfires/meet-bonfire');
+            }
+            nameString = bonfire.name.toLowerCase().replace(/\s/g, '-');
+            return res.redirect('../bonfires/' + nameString);
+        });
     });
 };
 
@@ -76,7 +76,7 @@ exports.returnIndividualBonfire = function(req, res, next) {
 
     Bonfire.find({"name" : new RegExp(bonfireName, 'i')}, function(err, bonfire) {
         if (err) {
-            next(err);
+            return next(err);
         }
 
 
@@ -215,7 +215,7 @@ exports.generateChallenge = function(req, res) {
     res.send(response);
 };
 
-exports.completedBonfire = function (req, res) {
+exports.completedBonfire = function (req, res, next) {
     var isCompletedWith = req.body.bonfireInfo.completedWith || undefined;
     var isCompletedDate = Math.round(+new Date() / 1000);
     var bonfireHash = req.body.bonfireInfo.bonfireHash;
@@ -225,7 +225,7 @@ exports.completedBonfire = function (req, res) {
         var paired = User.find({"profile.username": isCompletedWith.toLowerCase()}).limit(1);
         paired.exec(function (err, pairedWith) {
             if (err) {
-                return err;
+                return next(err);
             } else {
                 var index = req.user.uncompletedBonfires.indexOf(bonfireHash);
                 if (index > -1) {
@@ -256,9 +256,12 @@ exports.completedBonfire = function (req, res) {
                 })
 
                 req.user.save(function (err, user) {
+                    if (err) {
+                        return next(err);
+                    }
                     pairedWith.save(function (err, paired) {
                         if (err) {
-                            throw err;
+                            return next(err);
                         }
                         if (user && paired) {
                             res.send(true);
@@ -284,7 +287,7 @@ exports.completedBonfire = function (req, res) {
 
         req.user.save(function (err, user) {
             if (err) {
-                throw err;
+                return next(err);
             }
             if (user) {
                 debug('Saving user');
@@ -292,4 +295,4 @@ exports.completedBonfire = function (req, res) {
             }
         });
     }
-};
\ No newline at end of file
+};
diff --git a/controllers/challenges.js b/controllers/challenges.js
index 6658e18e136..85dcae71308 100644
--- a/controllers/challenges.js
+++ b/controllers/challenges.js
@@ -27,7 +27,7 @@ exports.returnNextChallenge = function(req, res) {
     }
 };
 
-exports.returnChallenge = function(req, res) {
+exports.returnChallenge = function(req, res, next) {
     var challengeNumber = parseInt(req.params.challengeNumber) || 0;
     if (challengeNumber === 2) {
         return res.redirect('../challenges/3');
@@ -41,7 +41,7 @@ exports.returnChallenge = function(req, res) {
     Challenge.find({}, null, { sort: { challengeNumber: 1 } }, function(err, c) {
         if (err) {
             debug('Challenge err: ', err);
-            next(err);
+            return next(err);
         }
         res.render('challenges/show', {
             title: 'Challenge: ' + c[challengeNumber].name,
diff --git a/controllers/courseware.js b/controllers/courseware.js
index 58e57cef7da..069ede984fa 100644
--- a/controllers/courseware.js
+++ b/controllers/courseware.js
@@ -14,7 +14,7 @@ exports.coursewareNames = function(req, res) {
     });
 };
 
-exports.returnNextCourseware = function(req, res) {
+exports.returnNextCourseware = function(req, res, next) {
     if (!req.user) {
         return res.redirect('../coursewares/start-our-challenges');
     }
@@ -27,14 +27,16 @@ exports.returnNextCourseware = function(req, res) {
             return elem;
         }
     });
-    req.user.save();
+    req.user.save(function(err) {
+        if (err) return next(err);
+    });
 
     var uncompletedCoursewares = req.user.uncompletedCoursewares;
 
     var displayedCoursewares =  Courseware.find({'_id': uncompletedCoursewares[0]});
     displayedCoursewares.exec(function(err, courseware) {
         if (err) {
-            next(err);
+            return next(err);
         }
         courseware = courseware.pop();
         if (courseware === undefined) {
@@ -55,7 +57,7 @@ exports.returnIndividualCourseware = function(req, res, next) {
 
     Courseware.find({"name" : new RegExp(coursewareName, 'i')}, function(err, courseware) {
         if (err) {
-            next(err);
+            return next(err);
         }
         // Handle not found
         if (courseware.length < 1) {
@@ -203,7 +205,7 @@ exports.generateChallenge = function(req, res) {
     res.send(response);
 };
 
-exports.completedCourseware = function (req, res) {
+exports.completedCourseware = function (req, res, next) {
 
     var isCompletedDate = Math.round(+new Date() / 1000);
     var coursewareHash = req.body.coursewareInfo.coursewareHash;
@@ -221,10 +223,10 @@ exports.completedCourseware = function (req, res) {
 
     req.user.save(function (err, user) {
         if (err) {
-            throw err;
+            return next(err);
         }
         if (user) {
             res.send(true)
         }
     });
-};
\ No newline at end of file
+};
diff --git a/controllers/resources.js b/controllers/resources.js
index fe3d09c0aac..cf8fe48bde5 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -182,7 +182,9 @@ module.exports = {
         if (req.user) {
             if (!req.user.profile.picture || req.user.profile.picture === "https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png") {
                 req.user.profile.picture = "https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png";
-                req.user.save();
+                req.user.save(function(err) {
+                    if (err) return next(err);
+                });
             }
         }
         var date1 = new Date("10/15/2014");
diff --git a/controllers/user.js b/controllers/user.js
index 20fda23b1a1..5b0d2a9bb44 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -179,7 +179,7 @@ exports.postEmailSignup = function(req, res, next) {
                 ].join('')
             };
             transporter.sendMail(mailOptions, function(err) {
-                if (err) { return err; }
+                if (err) { return next(err); }
             });
         });
     });
@@ -210,8 +210,9 @@ exports.getAccountAngular = function(req, res) {
  * Unique username check API Call
  */
 
-exports.checkUniqueUsername = function(req, res) {
+exports.checkUniqueUsername = function(req, res, next) {
     User.count({'profile.username': req.params.username.toLowerCase()}, function (err, data) {
+        if (err) { return next(err); }
         if (data == 1) {
             return res.send(true);
         } else {
@@ -223,8 +224,9 @@ exports.checkUniqueUsername = function(req, res) {
 /**
  * Existing username check
  */
-exports.checkExistingUsername = function(req, res) {
+exports.checkExistingUsername = function(req, res, next) {
     User.count({'profile.username': req.params.username.toLowerCase()}, function (err, data) {
+        if (err) { return next(err); }
         if (data === 1) {
             return res.send(true);
         } else {
@@ -237,8 +239,9 @@ exports.checkExistingUsername = function(req, res) {
  * Unique email check API Call
  */
 
-exports.checkUniqueEmail = function(req, res) {
+exports.checkUniqueEmail = function(req, res, next) {
     User.count({'email': decodeURIComponent(req.params.email).toLowerCase()}, function (err, data) {
+        if (err) { return next(err); }
         if (data == 1) {
             return res.send(true);
         } else {
@@ -255,10 +258,11 @@ exports.checkUniqueEmail = function(req, res) {
 
 exports.returnUser = function(req, res, next) {
     User.find({'profile.username': req.params.username.toLowerCase()}, function(err, user) {
-        if (err) { debug('Username err: ', err); next(err); }
+        if (err) { debug('Username err: ', err); return next(err); }
         if (user[0]) {
             var user = user[0];
             Challenge.find({}, null, {sort: {challengeNumber: 1}}, function (err, c) {
+                if (err) { return next(err); }
                 res.render('account/show', {
                     title: 'Camper ' + user.profile.username + '\'s portfolio',
                     username: user.profile.username,
@@ -300,7 +304,7 @@ exports.returnUser = function(req, res, next) {
  * Update profile information.
  */
 
-exports.updateProgress = function(req, res) {
+exports.updateProgress = function(req, res, next) {
     User.findById(req.user.id, function(err, user) {
         if (err) return next(err);
         user.email = req.body.email || '';
@@ -471,7 +475,7 @@ exports.getOauthUnlink = function(req, res, next) {
  * Reset Password page.
  */
 
-exports.getReset = function(req, res) {
+exports.getReset = function(req, res, next) {
     if (req.isAuthenticated()) {
         return res.redirect('/');
     }

From 5bb084120e8601e430874951f83954636dec377d Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Sun, 29 Mar 2015 17:28:25 -0700
Subject: [PATCH 02/24] create a styleguide from @brndbr's sample style guide

---
 app.js                          |  1 +
 controllers/resources.js        |  6 ++++++
 views/resources/styleguide.jade | 26 ++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 views/resources/styleguide.jade

diff --git a/app.js b/app.js
index ecbdc18fd5b..3c1ef9e70b9 100644
--- a/app.js
+++ b/app.js
@@ -235,6 +235,7 @@ app.get('/install-screenhero', resourcesController.installScreenHero);
 app.get('/javascript-in-your-inbox', resourcesController.javaScriptInYourInbox);
 app.get('/guide-to-our-nonprofit-projects', resourcesController.guideToOurNonprofitProjects);
 app.get('/chromebook', resourcesController.chromebook);
+app.get('/styleguide', resourcesController.styleguide);
 app.get('/deploy-a-website', resourcesController.deployAWebsite);
 app.get('/gmail-shortcuts', resourcesController.gmailShortcuts);
 app.get('/control-shortcuts', resourcesController.controlShortcuts);
diff --git a/controllers/resources.js b/controllers/resources.js
index b6897857b0f..0d8c0e5d552 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -109,6 +109,12 @@ module.exports = {
         });
     },
 
+    styleguide: function styleguide(req, res) {
+        res.render('resources/styleguide', {
+            title: 'A Styleguide for Contributing to our Bonfires'
+        });
+    },
+
     jqueryExercises: function jqueryExercises(req, res) {
         res.render('resources/jquery-exercises', {
             title: 'jQuery Exercises'
diff --git a/views/resources/styleguide.jade b/views/resources/styleguide.jade
new file mode 100644
index 00000000000..71303aa4b1c
--- /dev/null
+++ b/views/resources/styleguide.jade
@@ -0,0 +1,26 @@
+extends ../layout
+block content
+    .jumbotron.text-left
+        h1.hug-top.text-center Bonfire Style Guide
+        h3 Writing Bonfire challenges is a great way to exercise your own problem solving and testing abilities. It is a simple three step process.
+        h4
+            ol
+                li Fill out the generator form and test your challenge:&thinsp;
+                    a(href="http://www.freecodecamp.com/bonfire-challenge-generator") http://www.freecodecamp.com/bonfire-challenge-generator
+                li Once you have confirmed a working bonfire challenge in the generator, copy and paste the the fields into the JSON generator: http://www.freecodecamp.com/bonfire-json-generator
+                li Copy the JSON, fork the freecodecamp repository, and submit a pull request with your addition to the bonfires.json:&thinsp;
+                    a(href="https://github.com/FreeCodeCamp/freecodecamp/blob/master/seed_data/bonfires.json") https://github.com/FreeCodeCamp/freecodecamp/blob/master/seed_data/bonfires.json
+        h3 Name
+        p Name your challenge
+        h3 Difficulty
+        p Attempt to rate difficulty compared against existing bonfire challenges.
+        h3 Description
+        p Separate paragraphs with a line break. Only the first paragraph is visible prior to a user clicking the "More information" button.
+        p All necessary information must be included in the first paragraph. Write this first paragraph as succinct as possible. Subsequent paragraphs should offer hints or details if needed.
+        p If your subject matter warrants deeper understanding, you may link to Wikipedia.
+        h3 Challenge Seed
+        p This is where you set up what will be in the editor when the camper starts the bonfire.
+        h3 Tests
+        p These tests are what bring your challenge to life. Without them, we cannot confirm the accuracy of a user's submitted answer. Choose your tests wisely.
+        p Bonfire tests are written using the Chai.js assertion library. Please use the should and expect syntax for end user readability. As an example of what not do to, many of the original Bonfire challenges are written with assert syntax and many of the test cases are difficult to read.
+        p If your bonfire question has a lot of edge cases, you will need to write many tests for full coverage. If you find yourself writing more tests than you desire, you may consider simplifying the requirements of your bonfire challenge. For difficulty level 1 through 3, you will generally only need 2 to 4 tests.
\ No newline at end of file

From f5d6abdfefdf91f3578cd1d26ed40dbe7100d7db Mon Sep 17 00:00:00 2001
From: jameskopacz <jameskopacz@users.noreply.github.com>
Date: Mon, 30 Mar 2015 23:14:39 -0500
Subject: [PATCH 03/24] On story submission create unique story URL if slug
 already exists

---
 controllers/story.js | 75 +++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/controllers/story.js b/controllers/story.js
index 82032ba7524..1ec16fc9d2a 100644
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -119,13 +119,13 @@ exports.returnIndividualStory = function(req, res, next) {
 
     var storyName = dashedName.replace(/\-/g, ' ');
 
-    Story.find({'storyLink' : new RegExp(storyName, 'i')}, function(err, story) {
+    Story.findOne({'storyLink' : new RegExp(storyName, 'i')}, function(err, story) {
         if (err) {
             next(err);
         }
 
 
-        if (story.length < 1) {
+        if (story == null) {
             req.flash('errors', {
                 msg: "404: We couldn't find a story with that name. Please double check the name."
             });
@@ -133,13 +133,12 @@ exports.returnIndividualStory = function(req, res, next) {
             return res.redirect('/stories/');
         }
 
-        story = story.pop();
         var dashedNameFull = story.storyLink.toLowerCase().replace(/\s/g, '-');
         if (dashedNameFull !== dashedName) {
             return res.redirect('../stories/' + dashedNameFull);
         }
 
-		var userVoted = false;
+        var userVoted = false;
         try {
             var votedObj = story.upVotes.filter(function(a){
                 return a['upVotedByUsername'] === req.user['profile']['username'];
@@ -150,7 +149,7 @@ exports.returnIndividualStory = function(req, res, next) {
         } catch(err){
             userVoted = false;
         }
-	res.render('stories/index', {
+        res.render('stories/index', {
             title: story.headline,
             link: story.link,
             author: story.author,
@@ -163,7 +162,7 @@ exports.returnIndividualStory = function(req, res, next) {
             image: story.image,
             page: 'show',
             storyMetaDescription: story.metaDescription,
-			hasUserVoted: userVoted
+            hasUserVoted: userVoted
         });
     });
 };
@@ -308,37 +307,47 @@ exports.storySubmission = function(req, res) {
         .replace(/[^a-z0-9]/gi, ' ')
         .replace(/\s+/g, ' ')
         .toLowerCase();
-    var link = data.link;
-    if (link.search(/^https?:\/\//g) === -1) {
-        link = 'http://' + link;
-    }
-    var story = new Story({
-        headline: sanitizeHtml(data.headline, {
-                    allowedTags: [],
-                    allowedAttributes: []
-                  }).replace(/&quot;/g, '"'),
-        timePosted: Date.now(),
-        link: link,
-        description: sanitizeHtml(data.description, {
-                        allowedTags: [],
-                        allowedAttributes: []
-                    }).replace(/&quot;/g, '"'),
-        rank: 1,
-        upVotes: data.upVotes,
-        author: data.author,
-        comments: [],
-        image: data.image,
-        storyLink: storyLink,
-        metaDescription: data.storyMetaDescription
-    });
 
-    story.save(function(err) {
+    Story.count({'storyLink': storyLink}, function(err, storyCount) {
         if (err) {
             return res.status(500);
         }
-        res.send(JSON.stringify({
-            storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase()
-        }));
+
+        // if duplicate storyLink add unique number
+        storyLink = (storyCount == 0) ? storyLink : storyLink + ' ' + storyCount;
+
+        var link = data.link;
+        if (link.search(/^https?:\/\//g) === -1) {
+            link = 'http://' + link;
+        }
+        var story = new Story({
+            headline: sanitizeHtml(data.headline, {
+                        allowedTags: [],
+                        allowedAttributes: []
+                      }).replace(/&quot;/g, '"'),
+            timePosted: Date.now(),
+            link: link,
+            description: sanitizeHtml(data.description, {
+                            allowedTags: [],
+                            allowedAttributes: []
+                        }).replace(/&quot;/g, '"'),
+            rank: 1,
+            upVotes: data.upVotes,
+            author: data.author,
+            comments: [],
+            image: data.image,
+            storyLink: storyLink,
+            metaDescription: data.storyMetaDescription
+        });
+
+        story.save(function(err) {
+            if (err) {
+                return res.status(500);
+            }
+            res.send(JSON.stringify({
+                storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase()
+            }));
+        });
     });
 };
 

From a24ad9b993efaed77ed4b63db90cf9a21b61b1cb Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Tue, 31 Mar 2015 10:00:30 -0700
Subject: [PATCH 04/24] update the welcome mailer and change fontsize on
 bonfire helpful links

---
 config/passport.js      | 2 +-
 views/bonfire/show.jade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/passport.js b/config/passport.js
index 970753ce211..1f2ebe8037f 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -114,7 +114,7 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r
               'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
               "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
               'Good luck with the challenges!\n\n',
-              '- the Volunteer Camp Counselor Team'
+              '- Our All-Volunteer Team'
             ].join('')
           };
           transporter.sendMail(mailOptions, function(err) {
diff --git a/views/bonfire/show.jade b/views/bonfire/show.jade
index aed449bdb53..6c9997d4b43 100644
--- a/views/bonfire/show.jade
+++ b/views/bonfire/show.jade
@@ -74,7 +74,7 @@ block content
                                         for sentence in details
                                             p!= sentence
                                         #MDN-links
-                                            h4 Here are some helpful links.
+                                            p Here are some helpful links:
                                             for link, index in MDNlinks
                                                 ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]}
                                         #less-info.btn.btn-primary.btn-block.btn-primary-ghost

From a60c5eb92c9a57ea8b99e8580b785527b600b712 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Tue, 31 Mar 2015 15:07:34 -0700
Subject: [PATCH 05/24] refactor passport so that emails aren't fired if there
 are errors in save actions

---
 config/passport.js   | 47 ++++++++++++++++++++++----------------------
 controllers/story.js |  4 ++--
 controllers/user.js  | 46 +++++++++++++++++++++----------------------
 3 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/config/passport.js b/config/passport.js
index 1f2ebe8037f..799ee1f83b1 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -82,6 +82,7 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r
     User.findOne({ facebook: profile.id }, function(err, existingUser) {
       if (existingUser) return done(null, existingUser);
       User.findOne({ email: profile._json.email }, function(err, existingEmailUser) {
+        if (err) { return done(err); }
         if (existingEmailUser) {
           req.flash('errors', { msg: 'There is already an account using this email address. Sign in to that account and link it with Facebook manually from Account Settings.' });
           done();
@@ -96,29 +97,29 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r
           user.profile.location = (profile._json.location) ? profile._json.location.name : '';
           user.save(function(err) {
             done(err, user);
-          });
-          var transporter = nodemailer.createTransport({
-            service: 'Mandrill',
-            auth: {
-              user: secrets.mandrill.user,
-              pass: secrets.mandrill.password
-            }
-          });
-          var mailOptions = {
-            to: user.email,
-            from: 'Team@freecodecamp.com',
-            subject: 'Welcome to Free Code Camp!',
-            text: [
-              'Greetings from San Francisco!\n\n',
-              'Thank you for joining our community.\n',
-              'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
-              "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
-              'Good luck with the challenges!\n\n',
-              '- Our All-Volunteer Team'
-            ].join('')
-          };
-          transporter.sendMail(mailOptions, function(err) {
-            if (err) { return err; }
+            var transporter = nodemailer.createTransport({
+              service: 'Mandrill',
+              auth: {
+                user: secrets.mandrill.user,
+                pass: secrets.mandrill.password
+              }
+            });
+            var mailOptions = {
+              to: user.email,
+              from: 'Team@freecodecamp.com',
+              subject: 'Welcome to Free Code Camp!',
+              text: [
+                'Greetings from San Francisco!\n\n',
+                'Thank you for joining our community.\n',
+                'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
+                "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
+                'Good luck with the challenges!\n\n',
+                '- Our All-Volunteer Team'
+              ].join('')
+            };
+            transporter.sendMail(mailOptions, function(err) {
+              if (err) { return err; }
+            });
           });
         }
       });
diff --git a/controllers/story.js b/controllers/story.js
index 1ec16fc9d2a..be62c54b4c3 100644
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -142,7 +142,7 @@ exports.returnIndividualStory = function(req, res, next) {
         try {
             var votedObj = story.upVotes.filter(function(a){
                 return a['upVotedByUsername'] === req.user['profile']['username'];
-            })
+            });
             if (votedObj.length > 0){
                 userVoted = true;
             }
@@ -314,7 +314,7 @@ exports.storySubmission = function(req, res) {
         }
 
         // if duplicate storyLink add unique number
-        storyLink = (storyCount == 0) ? storyLink : storyLink + ' ' + storyCount;
+        storyLink = (storyCount === 0) ? storyLink : storyLink + ' ' + storyCount;
 
         var link = data.link;
         if (link.search(/^https?:\/\//g) === -1) {
diff --git a/controllers/user.js b/controllers/user.js
index 20fda23b1a1..bd0a0cb326a 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -153,34 +153,34 @@ exports.postEmailSignup = function(req, res, next) {
 
             user.save(function(err) {
                 if (err) { return next(err); }
+                var transporter = nodemailer.createTransport({
+                    service: 'Mandrill',
+                    auth: {
+                        user: secrets.mandrill.user,
+                        pass: secrets.mandrill.password
+                    }
+                });
+                var mailOptions = {
+                    to: user.email,
+                    from: 'Team@freecodecamp.com',
+                    subject: 'Welcome to Free Code Camp!',
+                    text: [
+                        'Greetings from San Francisco!\n\n',
+                        'Thank you for joining our community.\n',
+                        'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
+                        "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
+                        'Good luck with the challenges!\n\n',
+                        '- Our All-Volunteer Team'
+                    ].join('')
+                };
+                transporter.sendMail(mailOptions, function(err) {
+                    if (err) { return err; }
+                });
                 req.logIn(user, function(err) {
                     if (err) { return next(err); }
                     res.redirect('/email-signup');
                 });
             });
-            var transporter = nodemailer.createTransport({
-                service: 'Mandrill',
-                auth: {
-                    user: secrets.mandrill.user,
-                    pass: secrets.mandrill.password
-                }
-            });
-            var mailOptions = {
-                to: user.email,
-                from: 'Team@freecodecamp.com',
-                subject: 'Welcome to Free Code Camp!',
-                text: [
-                    'Greetings from San Francisco!\n\n',
-                    'Thank you for joining our community.\n',
-                    'Feel free to email us at this address if you have any questions about Free Code Camp.\n',
-                    "And if you have a moment, check out our blog: blog.freecodecamp.com.\n",
-                    'Good luck with the challenges!\n\n',
-                    '- the Volunteer Camp Counselor Team'
-                ].join('')
-            };
-            transporter.sendMail(mailOptions, function(err) {
-                if (err) { return err; }
-            });
         });
     });
 };

From 29568d45b8d87fff8cc7533cb2304251872231bb Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Fri, 3 Apr 2015 23:54:31 -0700
Subject: [PATCH 06/24] fix a typo related to challenge tweets

---
 views/challenges/show.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/challenges/show.jade b/views/challenges/show.jade
index a0c81d2a7b6..a03b095640a 100644
--- a/views/challenges/show.jade
+++ b/views/challenges/show.jade
@@ -50,7 +50,7 @@ block content
                 .success(
                 function (data) {
                     console.log(data);
-                    url = "https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Bonfire:%20#{name}&url=" + data + "&hashtags=LearnToCode, JavaScript";
+                    url = "https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20Challenge:%20#{name}&url=" + data + "&hashtags=LearnToCode, JavaScript";
                     $('.btn-twitter').attr('href', url);
                 }
         );
\ No newline at end of file

From 407bc99061a93ac9248a711655bb40ef5b42e779 Mon Sep 17 00:00:00 2001
From: Ashley Drake <a.l.drake713@gmail.com>
Date: Mon, 6 Apr 2015 09:54:49 -0400
Subject: [PATCH 07/24] Fixed chai-jquery tests for coursewares that were not
 catching correct entries for color attrs.

---
 seed_data/coursewares.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/seed_data/coursewares.json b/seed_data/coursewares.json
index baf5986e280..72bf8f1b5d3 100644
--- a/seed_data/coursewares.json
+++ b/seed_data/coursewares.json
@@ -162,7 +162,7 @@
       "Here's how you would set the <code>h2</code> element's text color to blue: <code>&#60;h2 style=\"color: blue\"&#62;cat photo app&#60;h2&#62;</code>"
     ],
     "tests": [
-      "expect($('h2')).to.have.css('color', '#ff0000');"
+      "expect($('h2')).to.have.css('color', 'rgb(255, 0, 0)');"
     ],
     "challengeSeed": [
       "<h1>hello world</h1>",
@@ -186,7 +186,7 @@
       "Note that it's important to have an <code>opening and closing curly braces</code> (<code>{</code> and <code>}</code>) around each element's style. You also need to make sure your element's style is between the opening and closing style tags. Finally, be sure to add the semicolon to the end of each of the element's styles."
     ],
     "tests": [
-      "expect($('h2')).to.have.css('color', '#0000ff');"
+      "expect($('h2')).to.have.css('color', 'rgb(0, 0, 255)');"
     ],
     "challengeSeed": [
       "<h1>hello world</h1>", 
@@ -207,7 +207,7 @@
       "You can follow that pattern to make a <code>red-text</code> class, which you can attach to HTML elements by using the <code>class=\"class\"</code> within the relevant element's opening tag."
     ],
     "tests": [
-      "expect($('h2')).to.have.css('color', '#ff0000');",
+      "expect($('h2')).to.have.css('color', 'rgb(255, 0, 0)');",
       "expect($('h2')).to.have.class('red-text');"
     ],
     "challengeSeed": [
@@ -235,9 +235,9 @@
       "expect($('h1')).to.have.class('red-text');",
       "expect($('h2')).to.have.class('red-text');",
       "expect($('p')).to.have.class('red-text');",
-      "expect($('h1')).to.have.css('color', '#ff0000');",
-      "expect($('h2')).to.have.css('color', '#ff0000');",
-      "expect($('p')).to.have.css('color', '#ff0000');"
+      "expect($('h1')).to.have.css('color', 'rgb(255, 0, 0)');",
+      "expect($('h2')).to.have.css('color', 'rgb(255, 0, 0)');",
+      "expect($('p')).to.have.css('color', 'rgb(255, 0, 0)');"
     ],
     "challengeSeed": [
       "<style>",
@@ -322,7 +322,7 @@
       "There are several default fonts that are available in all browsers. These include <code>Monospace</code>, <code>Serif</code> and <code>Sans-Serif</code>. See if you can set the <code>h2</code> elements to use Lobster and degrade to <code>Monospace</code>."
     ],
     "tests": [
-      "expect($('h2')).to.have.css('font-family').match(/monospace/i);",
+      "expect($('h2')).to.have.css('font-family').match(/Serif/i);",
       "expect($('h2')).to.have.css('font-family').match(/lobster/i);"
     ],
     "challengeSeed": [
@@ -355,7 +355,7 @@
     "tests": [
       "expect($('h2')).to.have.class('urgently-red');",
       "expect($('h2')).to.have.class('blue-text');",
-      "expect($('h2')).to.have.css('color', '#ff0000');"
+      "expect($('h2')).to.have.css('color', 'rgb(255, 0, 0)');"
     ],
     "challengeSeed": [
       "<style>",
@@ -423,7 +423,7 @@
       "Now figure out how to make the bright green in the \"red-text\" class into a bright red."
     ],
     "tests": [
-      "expect($('h2')).to.have.css('color', '#ff0000');",
+      "expect($('h2')).to.have.css('color', 'rgb(255, 0, 0)');",
       "expect($('h2')).to.have.class('red-text');"
     ],
     "challengeSeed": [
@@ -449,7 +449,7 @@
       "You can also shorten the 6-digit color hex code to a 3-digit code. For example, <code>#00ff00</code> becomes <code>#0f0</code>. This is less precise, but equally effective."
     ],
     "tests": [
-      "expect($('h2')).to.have.css('color', '#ff0000');",
+      "expect($('h2')).to.have.css('color', 'rgb(255, 0, 0)');",
       "expect($('h2')).to.have.class('red-text');"
     ],
     "challengeSeed": [
@@ -566,7 +566,7 @@
     ],
     "tests": [
       "expect($('img')).to.have.class('thick-green-border');",
-      "expect($('img')).to.have.css('border-color', '#00ff00');",
+      "expect($('img')).to.have.css('border-color', 'rgb(0, 255, 0)');",
       "expect($('img')).to.have.css('border-width', '10px');"
     ],
     "challengeSeed": [

From 2c6a7818907decc742465fef428867d856701745 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Tue, 7 Apr 2015 00:32:01 -0700
Subject: [PATCH 08/24] add inspectlet javascript

---
 views/partials/universal-head.jade | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/views/partials/universal-head.jade b/views/partials/universal-head.jade
index 10308e00655..d0c6ec57f3d 100644
--- a/views/partials/universal-head.jade
+++ b/views/partials/universal-head.jade
@@ -14,4 +14,20 @@ script.
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
     ga('create', 'UA-55446531-1', 'auto');
     ga('require', 'displayfeatures');
-    ga('send', 'pageview');
\ No newline at end of file
+    ga('send', 'pageview');
+script#inspectletjs(type='text/javascript').
+    window.__insp = window.__insp || [];
+    __insp.push(['wid', 561999918]);
+    (function() {
+        function __ldinsp() {
+            var insp = document.createElement('script');
+            insp.type = 'text/javascript';
+            insp.async = true;
+            insp.id = "inspsync";
+            insp.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://cdn.inspectlet.com/inspectlet.js';
+            var x = document.getElementsByTagName('script')[0];
+            x.parentNode.insertBefore(insp, x);
+        }
+        if (window.attachEvent) window.attachEvent('onload', __ldinsp);
+        else window.addEventListener('load', __ldinsp, false);
+    })();
\ No newline at end of file

From e3acdb9ebb5e6c1e79f4083407a51d26c6f51c76 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Wed, 8 Apr 2015 21:53:08 -0700
Subject: [PATCH 09/24] add slack key to secrets.js

---
 config/secrets.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/secrets.js b/config/secrets.js
index 419b9277927..7083405f7d9 100644
--- a/config/secrets.js
+++ b/config/secrets.js
@@ -10,7 +10,11 @@ module.exports = {
   },
 
   blogger: {
-    key: process.env.BLOGGER_KEY,
+    key: process.env.BLOGGER_KEY
+  },
+
+  slack: {
+    key: process.env.SLACK_KEY
   },
 
   mandrill: {

From 9145e959de2609a21aab0bf1d7b8271bc7b6324a Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Wed, 8 Apr 2015 22:42:40 -0700
Subject: [PATCH 10/24] able to use the api upon button click

---
 app.js                             | 57 +++++++++++++++++++++++++++++-
 controllers/resources.js           |  5 +++
 models/User.js                     |  1 +
 views/resources/learn-to-code.jade |  3 ++
 4 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 3c1ef9e70b9..ed06fe116de 100644
--- a/app.js
+++ b/app.js
@@ -31,6 +31,7 @@ var express = require('express'),
     passport = require('passport'),
     expressValidator = require('express-validator'),
     connectAssets = require('connect-assets'),
+    request = require('request'),
 
     /**
      * Controllers (route handlers).
@@ -46,7 +47,7 @@ var express = require('express'),
     /**
      *  Stories
      */
-    storyController = require('./controllers/story');
+    storyController = require('./controllers/story'),
 
     /**
      * API keys and Passport configuration.
@@ -292,6 +293,60 @@ app.post(
     userController.updateProgress
 );
 
+app.get('/api/slack', function(req, res) {
+  if (req.user) {
+    if (req.user.email) {
+      var invite = {
+        'email': req.user.email,
+        'token': process.env.SLACK_KEY,
+        'set_active': true
+      };
+
+      var headers = {
+        'User-Agent': 'Node Browser/0.0.1',
+        'Content-Type': 'application/x-www-form-urlencoded'
+      };
+
+      var options = {
+        url: 'https://freecode.slack.com/api/users.admin.invite',
+        method: 'POST',
+        headers: headers,
+        form: invite
+      };
+
+      request(options, function (error, response, body) {
+        if (!error && response.statusCode === 200) {
+          req.flash('success', {
+            msg: "We've successfully requested an invite for you. Please check your email and follow the instructions from Slack."
+          });
+          req.user.sentSlackInvite = true;
+          req.user.save(function(err, user) {
+            if (err) {
+              next(err);
+            }
+            return res.redirect('back');
+          });
+        } else {
+          req.flash('errors', {
+            msg: "The invitation email did not go through for some reason. Please try again or <a href='mailto:team@freecodecamp.com?subject=slack%20invite%20failed%20to%20send>email us</a>."
+          });
+          return res.redirect('back');
+        }
+      })
+    } else {
+      req.flash('notice', {
+        msg: "Before we can send your Slack invite, we need your email address. Please update your profile information here."
+      });
+      return res.redirect('/account');
+    }
+  } else {
+    req.flash('notice', {
+      msg: "You need to sign in to Free Code Camp before we can send you a Slack invite."
+    });
+    return res.redirect('/account');
+  }
+});
+
 /**
  * Main routes.
  */
diff --git a/controllers/resources.js b/controllers/resources.js
index 94d0ece5575..b8f4f3e9749 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -74,6 +74,11 @@ module.exports = {
     },
 
     chat: function chat(req, res) {
+        if (req.user) {
+          if (req.user.sentSlackInvite) {
+            res.redirect('https://freecode.slack.com/messages/general/');
+          }
+        }
         res.render('resources/chat', {
             title: "Enter Free Code Camp's Chat Rooms"
         });
diff --git a/models/User.js b/models/User.js
index f2f154e5bd9..083d95f871d 100644
--- a/models/User.js
+++ b/models/User.js
@@ -348,6 +348,7 @@ var userSchema = new mongoose.Schema({
         }
     },
     resetPasswordToken: String,
+    sentSlackInvite: false,
     resetPasswordExpires: Date,
     uncompletedBonfires: Array,
     completedBonfires: Array,
diff --git a/views/resources/learn-to-code.jade b/views/resources/learn-to-code.jade
index 1aaea115b2a..16624e20bf2 100644
--- a/views/resources/learn-to-code.jade
+++ b/views/resources/learn-to-code.jade
@@ -4,6 +4,9 @@ block content
     br
     .text-center
         if (user)
+            if (!user.sentSlackInvite)
+                a.btn.btn-primary.signup-btn.next-challenge-button(href="/api/slack") Join our Slack Chat Room
+                .spacer
             a.btn.btn-cta.signup-btn.next-challenge-button(href="/challenges") Take me to my next challenge
         else
             a.btn.btn-cta.signup-btn.next-challenge-button(href="/signin") Start learning to code (it's free)

From 9fb048183cf22f85f576bbcfff109ff994196d74 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Wed, 8 Apr 2015 22:52:14 -0700
Subject: [PATCH 11/24] finish up adding the slack functionality with a
 redirect on the chat navbar button

---
 controllers/resources.js           | 11 +++++------
 views/partials/navbar.jade         |  2 +-
 views/resources/learn-to-code.jade |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/controllers/resources.js b/controllers/resources.js
index b8f4f3e9749..e8fbb0a6ee1 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -74,14 +74,13 @@ module.exports = {
     },
 
     chat: function chat(req, res) {
-        if (req.user) {
-          if (req.user.sentSlackInvite) {
+        if (req.user && req.user.sentSlackInvite) {
             res.redirect('https://freecode.slack.com/messages/general/');
-          }
+        } else {
+            res.render('resources/chat', {
+                title: "Join our chat room"
+            });
         }
-        res.render('resources/chat', {
-            title: "Enter Free Code Camp's Chat Rooms"
-        });
     },
 
     nonprofitProjectInstructions: function nonprofitProjectInstructions(req, res) {
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index f457302b67e..2db9c5016ee 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -14,7 +14,7 @@
         li
             a(href='/challenges') Challenges
         li
-            a(href='/chat') Chat
+            a(href='/chat', target='_blank') Chat
         li
             a(href='/stories/hot') News
         li
diff --git a/views/resources/learn-to-code.jade b/views/resources/learn-to-code.jade
index 16624e20bf2..18291a5f2e5 100644
--- a/views/resources/learn-to-code.jade
+++ b/views/resources/learn-to-code.jade
@@ -5,7 +5,7 @@ block content
     .text-center
         if (user)
             if (!user.sentSlackInvite)
-                a.btn.btn-primary.signup-btn.next-challenge-button(href="/api/slack") Join our Slack Chat Room
+                a.btn.btn-primary.btn-cta.next-challenge-button(href="/api/slack") Join our Slack Chat Room
                 .spacer
             a.btn.btn-cta.signup-btn.next-challenge-button(href="/challenges") Take me to my next challenge
         else

From 62cabd56ff69c2649e905923ed2578adfb9870a6 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Thu, 9 Apr 2015 12:58:30 -0700
Subject: [PATCH 12/24] update camper news and chat challenges to have new
 videos and updated copy

---
 controllers/challenges.js          | 16 -----------
 seed_data/challenges.json          | 43 +++++++++++++++---------------
 views/partials/navbar.jade         |  8 ++++--
 views/resources/learn-to-code.jade | 17 ++++++------
 4 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/controllers/challenges.js b/controllers/challenges.js
index 4461f3d0a0c..463edda9206 100644
--- a/controllers/challenges.js
+++ b/controllers/challenges.js
@@ -29,22 +29,6 @@ exports.returnNextChallenge = function(req, res) {
 
 exports.returnChallenge = function(req, res, next) {
     var challengeNumber = parseInt(req.params.challengeNumber) || 0;
-    if (challengeNumber === 2) {
-        req.user.challengesHash[challengeNumber] = Math.round(+new Date() / 1000);
-        var timestamp = req.user.challengesHash;
-        var points = 0;
-        for (var key in timestamp) {
-            if (timestamp[key] > 0 && req.body.challengeNumber < 54) {
-                points += 1;
-            }
-        }
-        req.user.points = points;
-        req.user.save(function(err) {
-            if (err) { return done(err); }
-        });
-
-        return res.redirect('../challenges/3');
-    }
 
     if (challengeNumber > highestChallengeNumber) {
         req.flash('errors', {
diff --git a/seed_data/challenges.json b/seed_data/challenges.json
index 826dc92cd1d..d4af0869474 100644
--- a/seed_data/challenges.json
+++ b/seed_data/challenges.json
@@ -5,7 +5,7 @@
     "video": "114486344",
     "challengeNumber": 0,
     "steps": [
-        "Watch this 1-minute video, or simply read this summary:",
+        "Watch this 1-minute video, or simply read this summary.",
         "Welcome to Free Code Camp. We're a community of busy people learning to code.",
         "We built this community because learning to code is hard. But anyone who can stay motivated can learn to code. And the best way to stay motivated is to code with friends.",
         "To maximize accessibility, all our challenges are self-paced, browser-based, and free.",
@@ -21,35 +21,34 @@
   {
     "name": "Join Our Chat Room",
     "time": 5,
-    "video": "114627322",
+    "video": "124555254",
     "challengeNumber": 1,
     "steps": [
-        "Now we're going to join the Free Code Camp chat room. You can come here any time of day to hang out, ask questions, or find another camper who's on the same challenge as you and wants to pair program.",
-        "If you don't already have a GitHub account, create one real quick at <a href='https://www.github.com' target='_blank'>https://www.github.com</a>.",
-        "Be sure to update your biographical information and upload an image. A picture of your face works best. This is how people will see you in the chat room, so put your best foot forward.",
-        "Now enter the chat room by going to <a href='https://gitter.im/FreeCodeCamp/FreeCodeCamp' target='_blank'>https://gitter.im/FreeCodeCamp/FreeCodeCamp</a> and clicking the \"sign in with GitHub\" button.",
-        "Introduce yourself to our chat room by typing: \"hello world!\".",
-        "Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
-        "Keep the chat room open while you work through the other challenges. That way you ask for help if you get stuck on a challenge. You can also socialize when you feel like taking a break.",
-        "Now that you've completed this challenge, you can go directly your most-recently visited chat room by clicking the \"Chat\" button in the navigation bar above."
+        "Now we're going to join the Free Code Camp chat room. You can come here any time of day to hang out, ask questions, or find another camper to pair program with.",
+        "Make sure your Free Code Camp account includes your email address. You can do this here: <a href='/account' target='_blank'>http://freecodecamp.com/account</a>.",
+        "Click this link, which will email you an invite to Free Code Camp's Slack chat room: <a href='/api/slack' target='_blank'>http://freecodecamp.com/api/slack</a>.",
+        "Now check your email and click the link in the email from Slack",
+        "Complete the sign up process, then update your biographical information and upload an image. A picture of your face works best. This is how people will see you in the chat room, so put your best foot forward.",
+      "Now enter the general chat room and introduce yourself to our chat room by typing: \"hello world!\".",
+      "Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
+      "Keep the chat room open while you work through the other challenges. That way you ask for help if you get stuck on a challenge. You can also socialize when you feel like taking a break.",
+      "You can also access this chat room by clicking the \"Chat\" button in the upper right hand corner."
     ]
   },
   {
-    "name": "Join Our Forum (currently disabled)",
+    "name": "Check out Camper News",
     "time": 5,
-    "video": "115275066",
+    "video": "124553410",
     "challengeNumber": 2,
     "steps": [
-        "Go to Free Code Camp's forum: <a href='http://forum.freecodecamp.com' target='_blank'>http://forum.freecodecamp.com</a>.",
-        "You can come here to share and discuss coding resources, ask questions to our entire community, and coordinate local Free Code Camp events.",
-        "Our chat room is great for realtime discussions, but our forum is ideal for longer-term discussions and open-ended questions.",
-        "Sign in with the Github account you created during Challenge 1.",
-        "Click on the \"Introduce yourself here\" discussion.",
-        "Here you can read through other Free Code Camp community members' self introductions.",
-        "Go ahead and type a brief self introduction of your own.",
-        "Click on the \"Categories\" drop-down menu. You should see a category called \"Local Chapters\". Click that. If your city isn't already on the list, create a topic for it. Otherwise, introduce yourself to the other campers from your city.",
-        "Come back here daily to ask questions, engage in discussions, and share links to helpful coding tools.",
-        "Now that you've completed this challenge, you can go directly to the forum by clicking the \"Forum\" button in the navigation bar above."
+      "Camper News is the best place for our campers to share and discuss helpful links.",
+      "Click \"News\" in the upper right hand corner.",
+      "You'll see a variety of links that have been submitted. Click on the \"Discuss\" button under one of them.",
+      "You can upvote links. This will push the link up the rankings of hot links.",
+      "You an also comment on a link. If someone responds to your comment, you'll get an email notification so you can come back and respond to them.",
+      "You can also submit links. You can modify the link's headline and also leave an initial comment about the link.",
+      "You can view the portfolio pages of any camper who has posted links or comments on Camper News. Just click on their photo.",
+      "When you submit a link, you'll get a point. You will also get a point each time someone upvotes your link."
     ]
   },
   {
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index 2db9c5016ee..852a687477d 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -13,8 +13,12 @@
     ul.nav.navbar-nav.navbar-right.hamburger-dropdown
         li
             a(href='/challenges') Challenges
-        li
-            a(href='/chat', target='_blank') Chat
+        if (user && user.sentSlackInvite)
+            li
+                a(href='/chat', target='_blank') Chat
+        else
+            li
+                a(href='/challenges/01') Chat
         li
             a(href='/stories/hot') News
         li
diff --git a/views/resources/learn-to-code.jade b/views/resources/learn-to-code.jade
index 18291a5f2e5..cf1cb685f56 100644
--- a/views/resources/learn-to-code.jade
+++ b/views/resources/learn-to-code.jade
@@ -2,14 +2,15 @@ extends ../layout-wide
 block content
     img.img-responsive.img-center(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner.png')
     br
-    .text-center
-        if (user)
-            if (!user.sentSlackInvite)
-                a.btn.btn-primary.btn-cta.next-challenge-button(href="/api/slack") Join our Slack Chat Room
-                .spacer
-            a.btn.btn-cta.signup-btn.next-challenge-button(href="/challenges") Take me to my next challenge
-        else
-            a.btn.btn-cta.signup-btn.next-challenge-button(href="/signin") Start learning to code (it's free)
+    .row.text-center
+        .col-xs-12.col-md-6.col-md-offset-3
+            if (user)
+                if (!user.sentSlackInvite)
+                    a.btn.btn-cta.signup-btn.next-challenge-button.btn-block(href="/challenges") Take me to my next challenge
+                    .spacer
+                    a.btn.btn-primary.btn-cta.next-challenge-button.btn-block(href="/api/slack") Join our Slack Chat Room
+            else
+                a.btn.btn-cta.signup-btn.next-challenge-button.btn-block(href="/signin") Start learning to code (it's free)
     br
     .row
         .col-xs-12.col-sm-12.col-md-4

From 6f752b2437f6132f117897ced20e4696a1c4294c Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Thu, 9 Apr 2015 13:06:36 -0700
Subject: [PATCH 13/24] minor tweaks to landing page

---
 views/home.jade | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/views/home.jade b/views/home.jade
index 70da30cc7e9..c7d876b1366 100644
--- a/views/home.jade
+++ b/views/home.jade
@@ -22,11 +22,12 @@ block content
                     img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_nonprofits.svg.gz', title='Help nonprofits')
                     p.landing-p Give nonprofits a boost by empowering them with code.
             .big-break
-            a.btn.btn-cta.signup-btn(href="/login") Start learning to code (it's free)
-            br
-            br
-            a.btn.nonprofit-cta.btn-success(href="/nonprofits") I'm with a nonprofit and want help coding something
-            .big-break
+            .row
+                .col-xs-12.col-sm-8.col-sm-offset-2
+                    a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free)
+                    .spacer
+                    a.btn.btn-cta.btn-success.btn-block(href="/nonprofits") My nonprofit needs coding help
+                    .big-break
             h2 Campers you'll hang out with:
             .row
                 .col-xs-12.col-sm-12.col-md-4
@@ -84,6 +85,8 @@ block content
                     li.ion-code &thinsp; You can get help in real time from our community chat rooms and forum
                     li.ion-code &thinsp; We all share one common goal: to boost our careers with code
             .big-break
-            a.btn.btn-cta.signup-btn(href="/login") Learn to code today (it's free)
+            .row
+                .col-xs-12.col-sm-8.col-sm-offset-2
+                    a.btn.btn-cta.signup-btn.btn-block(href="/login") Learn to code today (it's free)
             script.
                 challengeName = 'Home'
\ No newline at end of file

From 4fb119ab68e0f97a62a366255865e96cbfdd376f Mon Sep 17 00:00:00 2001
From: brndnb <branden@fermup.com>
Date: Tue, 14 Apr 2015 15:36:02 -0400
Subject: [PATCH 14/24] Add debug to app.js to troubleshoot twitter signin in
 production, unable to repliate locally

---
 app.js | 497 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 250 insertions(+), 247 deletions(-)

diff --git a/app.js b/app.js
index ed06fe116de..6b3df71c96c 100644
--- a/app.js
+++ b/app.js
@@ -15,45 +15,47 @@ process.on('uncaughtException', function (err) {
 });
 
 var express = require('express'),
-    accepts = require('accepts'),
-    cookieParser = require('cookie-parser'),
-    compress = require('compression'),
-    session = require('express-session'),
-    logger = require('morgan'),
-    errorHandler = require('errorhandler'),
-    methodOverride = require('method-override'),
-    bodyParser = require('body-parser'),
-    helmet = require('helmet'),
-    MongoStore = require('connect-mongo')(session),
-    flash = require('express-flash'),
-    path = require('path'),
-    mongoose = require('mongoose'),
-    passport = require('passport'),
-    expressValidator = require('express-validator'),
-    connectAssets = require('connect-assets'),
-    request = require('request'),
+  accepts = require('accepts'),
+  cookieParser = require('cookie-parser'),
+  compress = require('compression'),
+  session = require('express-session'),
+  logger = require('morgan'),
+  errorHandler = require('errorhandler'),
+  methodOverride = require('method-override'),
+  bodyParser = require('body-parser'),
+  helmet = require('helmet'),
+  MongoStore = require('connect-mongo')(session),
+  flash = require('express-flash'),
+  path = require('path'),
+  mongoose = require('mongoose'),
+  passport = require('passport'),
+  expressValidator = require('express-validator'),
+  connectAssets = require('connect-assets'),
+  request = require('request'),
+  debug = require('debug')('freecc:app');
 
-    /**
-     * Controllers (route handlers).
-     */
-    homeController = require('./controllers/home'),
-    challengesController = require('./controllers/challenges'),
-    resourcesController = require('./controllers/resources'),
-    userController = require('./controllers/user'),
-    contactController = require('./controllers/contact'),
-    bonfireController = require('./controllers/bonfire'),
-    coursewareController = require('./controllers/courseware'),
 
-    /**
-     *  Stories
-     */
-    storyController = require('./controllers/story'),
+  /**
+   * Controllers (route handlers).
+   */
+  homeController = require('./controllers/home'),
+  challengesController = require('./controllers/challenges'),
+  resourcesController = require('./controllers/resources'),
+  userController = require('./controllers/user'),
+  contactController = require('./controllers/contact'),
+  bonfireController = require('./controllers/bonfire'),
+  coursewareController = require('./controllers/courseware'),
 
-    /**
-     * API keys and Passport configuration.
-     */
-    secrets = require('./config/secrets'),
-    passportConf = require('./config/passport');
+  /**
+   *  Stories
+   */
+  storyController = require('./controllers/story'),
+
+  /**
+   * API keys and Passport configuration.
+   */
+  secrets = require('./config/secrets'),
+  passportConf = require('./config/passport');
 
 /**
  * Create Express server.
@@ -65,9 +67,9 @@ var app = express();
  */
 mongoose.connect(secrets.db);
 mongoose.connection.on('error', function () {
-    console.error(
-        'MongoDB Connection Error. Please make sure that MongoDB is running.'
-    );
+  console.error(
+    'MongoDB Connection Error. Please make sure that MongoDB is running.'
+  );
 });
 
 /**
@@ -82,32 +84,32 @@ app.use(compress());
 var oneYear = 31557600000;
 app.use(express.static(__dirname + '/public', {maxAge: oneYear}));
 app.use(connectAssets({
-    paths: [
-        path.join(__dirname, 'public/css'),
-        path.join(__dirname, 'public/js')
-    ],
-    helperContext: app.locals
+  paths: [
+    path.join(__dirname, 'public/css'),
+    path.join(__dirname, 'public/js')
+  ],
+  helperContext: app.locals
 }));
 app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({extended: true}));
 app.use(expressValidator({
-    customValidators: {
-        matchRegex: function (param, regex) {
-            return regex.test(param);
-        }
+  customValidators: {
+    matchRegex: function (param, regex) {
+      return regex.test(param);
     }
+  }
 }));
 app.use(methodOverride());
 app.use(cookieParser());
 app.use(session({
-    resave: true,
-    saveUninitialized: true,
-    secret: secrets.sessionSecret,
-    store: new MongoStore({
-        url: secrets.db,
-        'auto_reconnect': true
-    })
+  resave: true,
+  saveUninitialized: true,
+  secret: secrets.sessionSecret,
+  store: new MongoStore({
+    url: secrets.db,
+    'auto_reconnect': true
+  })
 }));
 app.use(passport.initialize());
 app.use(passport.session());
@@ -118,107 +120,107 @@ app.use(helmet.xssFilter());
 app.use(helmet.noSniff());
 app.use(helmet.xframe());
 app.use(function(req, res, next) {
-    res.header("Access-Control-Allow-Origin", "*");
-    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-    next();
+  res.header("Access-Control-Allow-Origin", "*");
+  res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+  next();
 });
 
 var trusted = [
-    "'self'",
-    '*.freecodecamp.com',
-    '*.gstatic.com',
-    '*.google-analytics.com',
-    '*.googleapis.com',
-    '*.google.com',
-    '*.gstatic.com',
-    '*.doubleclick.net',
-    '*.twitter.com',
-    '*.twitch.tv',
-    '*.twimg.com',
-    "'unsafe-eval'",
-    "'unsafe-inline'",
-    '*.rafflecopter.com',
-    '*.bootstrapcdn.com',
-    '*.cloudflare.com',
-    'https://*.cloudflare.com',
-    'localhost:3001',
-    'ws://localhost:3001/',
-    'http://localhost:3001',
-    'localhost:3000',
-    'ws://localhost:3000/',
-    'http://localhost:3000',
-    '*.ionicframework.com',
-    'https://syndication.twitter.com',
-    '*.youtube.com',
-    '*.jsdelivr.net',
-    'https://*.jsdelivr.net',
-    '*.togetherjs.com',
-    'https://*.togetherjs.com',
-    'wss://hub.togetherjs.com',
-    '*.ytimg.com',
-    'wss://fcctogether.herokuapp.com',
-    '*.bitly.com'
+  "'self'",
+  '*.freecodecamp.com',
+  '*.gstatic.com',
+  '*.google-analytics.com',
+  '*.googleapis.com',
+  '*.google.com',
+  '*.gstatic.com',
+  '*.doubleclick.net',
+  '*.twitter.com',
+  '*.twitch.tv',
+  '*.twimg.com',
+  "'unsafe-eval'",
+  "'unsafe-inline'",
+  '*.rafflecopter.com',
+  '*.bootstrapcdn.com',
+  '*.cloudflare.com',
+  'https://*.cloudflare.com',
+  'localhost:3001',
+  'ws://localhost:3001/',
+  'http://localhost:3001',
+  'localhost:3000',
+  'ws://localhost:3000/',
+  'http://localhost:3000',
+  '*.ionicframework.com',
+  'https://syndication.twitter.com',
+  '*.youtube.com',
+  '*.jsdelivr.net',
+  'https://*.jsdelivr.net',
+  '*.togetherjs.com',
+  'https://*.togetherjs.com',
+  'wss://hub.togetherjs.com',
+  '*.ytimg.com',
+  'wss://fcctogether.herokuapp.com',
+  '*.bitly.com'
 ];
 
 app.use(helmet.contentSecurityPolicy({
-    defaultSrc: trusted,
-    scriptSrc: ['*.optimizely.com', '*.aspnetcdn.com'].concat(trusted),
-    'connect-src': [
-        'ws://*.rafflecopter.com',
-        'wss://*.rafflecopter.com',
-        'https://*.rafflecopter.com',
-        'ws://www.freecodecamp.com',
-        'http://www.freecodecamp.com'
-    ].concat(trusted),
-    styleSrc: trusted,
-    imgSrc: [
-        '*.evernote.com',
-        '*.amazonaws.com',
-        'data:',
-        '*.licdn.com',
-        '*.gravatar.com',
-        '*.akamaihd.net',
-        'graph.facebook.com',
-        '*.githubusercontent.com',
-        '*.googleusercontent.com',
-        '*' /* allow all input since we have user submitted images for public profile*/
-    ].concat(trusted),
-    fontSrc: ['*.googleapis.com'].concat(trusted),
-    mediaSrc: [
-        '*.amazonaws.com',
-        '*.twitter.com'
-    ].concat(trusted),
-    frameSrc: [
-        '*.gitter.im',
-        '*.gitter.im https:',
-        '*.vimeo.com',
-        '*.twitter.com',
-        '*.rafflecopter.com',
-        '*.ghbtns.com'
-    ].concat(trusted),
-    reportOnly: false, // set to true if you only want to report errors
-    setAllHeaders: false, // set to true if you want to set all headers
-    safari5: false // set to true if you want to force buggy CSP in Safari 5
+  defaultSrc: trusted,
+  scriptSrc: ['*.optimizely.com', '*.aspnetcdn.com'].concat(trusted),
+  'connect-src': [
+    'ws://*.rafflecopter.com',
+    'wss://*.rafflecopter.com',
+    'https://*.rafflecopter.com',
+    'ws://www.freecodecamp.com',
+    'http://www.freecodecamp.com'
+  ].concat(trusted),
+  styleSrc: trusted,
+  imgSrc: [
+    '*.evernote.com',
+    '*.amazonaws.com',
+    'data:',
+    '*.licdn.com',
+    '*.gravatar.com',
+    '*.akamaihd.net',
+    'graph.facebook.com',
+    '*.githubusercontent.com',
+    '*.googleusercontent.com',
+    '*' /* allow all input since we have user submitted images for public profile*/
+  ].concat(trusted),
+  fontSrc: ['*.googleapis.com'].concat(trusted),
+  mediaSrc: [
+    '*.amazonaws.com',
+    '*.twitter.com'
+  ].concat(trusted),
+  frameSrc: [
+    '*.gitter.im',
+    '*.gitter.im https:',
+    '*.vimeo.com',
+    '*.twitter.com',
+    '*.rafflecopter.com',
+    '*.ghbtns.com'
+  ].concat(trusted),
+  reportOnly: false, // set to true if you only want to report errors
+  setAllHeaders: false, // set to true if you want to set all headers
+  safari5: false // set to true if you want to force buggy CSP in Safari 5
 }));
 
 app.use(function (req, res, next) {
-    // Make user object available in templates.
-    res.locals.user = req.user;
-    next();
+  // Make user object available in templates.
+  res.locals.user = req.user;
+  next();
 });
 
 app.use(function (req, res, next) {
-    // Remember original destination before login.
-    var path = req.path.split('/')[1];
-    if (/auth|login|logout|signup|fonts|favicon/i.test(path)) {
-        return next();
-    }
-    req.session.returnTo = req.path;
-    next();
+  // Remember original destination before login.
+  var path = req.path.split('/')[1];
+  if (/auth|login|logout|signup|fonts|favicon/i.test(path)) {
+    return next();
+  }
+  req.session.returnTo = req.path;
+  next();
 });
 
 app.use(
-    express.static(path.join(__dirname, 'public'), {maxAge: 31557600000})
+  express.static(path.join(__dirname, 'public'), {maxAge: 31557600000})
 );
 
 app.use(express.static(__dirname + '/public', { maxAge: 86400000 }));
@@ -243,23 +245,23 @@ app.get('/control-shortcuts', resourcesController.controlShortcuts);
 app.get('/control-shortcuts', resourcesController.deployAWebsite);
 app.get('/nodeschool-challenges', resourcesController.nodeSchoolChallenges);
 app.get('/stats', function(req, res) {
-    res.redirect(301, '/learn-to-code');
+  res.redirect(301, '/learn-to-code');
 });
 app.get('/news', function(req, res) {
-    res.redirect(301, '/stories/hot');
+  res.redirect(301, '/stories/hot');
 });
 app.get('/learn-to-code', resourcesController.about);
 app.get('/about', function(req, res) {
-    res.redirect(301, '/learn-to-code');
+  res.redirect(301, '/learn-to-code');
 });
 app.get('/signin', userController.getSignin);
 app.get('/login', function(req, res) {
-    res.redirect(301, '/signin');
+  res.redirect(301, '/signin');
 });
 app.post('/signin', userController.postSignin);
 app.get('/signout', userController.signout);
 app.get('/logout', function(req, res) {
-    res.redirect(301, '/signout');
+  res.redirect(301, '/signout');
 });
 app.get('/forgot', userController.getForgot);
 app.post('/forgot', userController.postForgot);
@@ -283,14 +285,14 @@ app.post(
   contactController.postDoneWithFirst100Hours
 );
 app.get(
-    '/nonprofit-project-instructions',
-    passportConf.isAuthenticated,
-    resourcesController.nonprofitProjectInstructions
+  '/nonprofit-project-instructions',
+  passportConf.isAuthenticated,
+  resourcesController.nonprofitProjectInstructions
 );
 app.post(
-    '/update-progress',
-    passportConf.isAuthenticated,
-    userController.updateProgress
+  '/update-progress',
+  passportConf.isAuthenticated,
+  userController.updateProgress
 );
 
 app.get('/api/slack', function(req, res) {
@@ -351,98 +353,98 @@ app.get('/api/slack', function(req, res) {
  * Main routes.
  */
 app.get(
-    '/stories/hotStories',
-    storyController.hotJSON
+  '/stories/hotStories',
+  storyController.hotJSON
 );
 
 app.get(
-    '/stories/recentStories',
-    storyController.recentJSON
+  '/stories/recentStories',
+  storyController.recentJSON
 );
 
 app.get(
-    '/stories/',
-    function(req, res) {
-        res.redirect(302, '/stories/hot');
-    }
+  '/stories/',
+  function(req, res) {
+    res.redirect(302, '/stories/hot');
+  }
 );
 
 app.get(
-    '/stories/comments/:id',
-    storyController.comments
+  '/stories/comments/:id',
+  storyController.comments
 );
 
 app.post(
-    '/stories/comment/',
-    storyController.commentSubmit
+  '/stories/comment/',
+  storyController.commentSubmit
 );
 
 app.post(
-    '/stories/comment/:id/comment',
-    storyController.commentOnCommentSubmit
+  '/stories/comment/:id/comment',
+  storyController.commentOnCommentSubmit
 );
 
 app.get(
-    '/stories/submit',
-    storyController.submitNew
+  '/stories/submit',
+  storyController.submitNew
 );
 
 app.get(
-    '/stories/submit/new-story',
-    storyController.preSubmit
+  '/stories/submit/new-story',
+  storyController.preSubmit
 );
 
 app.post(
-    '/stories/preliminary',
-    storyController.newStory
+  '/stories/preliminary',
+  storyController.newStory
 );
 
 app.post(
-    '/stories/',
-    storyController.storySubmission
+  '/stories/',
+  storyController.storySubmission
 );
 
 app.get(
-    '/stories/hot',
-    storyController.hot
+  '/stories/hot',
+  storyController.hot
 );
 
 app.get(
-    '/stories/recent',
-    storyController.recent
+  '/stories/recent',
+  storyController.recent
 );
 
 
 app.get(
-    '/stories/search',
-    storyController.search
+  '/stories/search',
+  storyController.search
 );
 
 app.post(
-    '/stories/search',
-    storyController.getStories
+  '/stories/search',
+  storyController.getStories
 );
 
 app.get(
-    '/stories/:storyName',
-    storyController.returnIndividualStory
+  '/stories/:storyName',
+  storyController.returnIndividualStory
 );
 
 app.post(
-    '/stories/upvote/',
-    storyController.upvote
+  '/stories/upvote/',
+  storyController.upvote
 );
 
 /**
  * Challenge related routes
  */
 app.get(
-    '/challenges/',
-    challengesController.returnNextChallenge
+  '/challenges/',
+  challengesController.returnNextChallenge
 );
 app.get(
-    '/challenges/:challengeNumber',
-    challengesController.returnChallenge
+  '/challenges/:challengeNumber',
+  challengesController.returnChallenge
 );
 
 app.all('/account', passportConf.isAuthenticated);
@@ -466,11 +468,11 @@ app.post('/bonfire-json-generator', bonfireController.generateChallenge);
 app.get('/bonfire-challenge-generator', bonfireController.publicGenerator);
 app.post('/bonfire-challenge-generator', bonfireController.testBonfire)
 app.get(
-    '/bonfires/:bonfireName',
-    bonfireController.returnIndividualBonfire
+  '/bonfires/:bonfireName',
+  bonfireController.returnIndividualBonfire
 );
 app.get('/bonfire', function(req, res) {
-    res.redirect(301, '/playground');
+  res.redirect(301, '/playground');
 });
 
 app.post('/completed-bonfire/', bonfireController.completedBonfire);
@@ -481,8 +483,8 @@ app.post('/completed-bonfire/', bonfireController.completedBonfire);
 
 app.get('/coursewares/', coursewareController.returnNextCourseware);
 app.get(
-    '/coursewares/:coursewareName',
-    coursewareController.returnIndividualCourseware
+  '/coursewares/:coursewareName',
+  coursewareController.returnIndividualCourseware
 );
 app.post('/completed-courseware/', coursewareController.completedCourseware);
 
@@ -504,20 +506,20 @@ app.get('/sitemap.xml', resourcesController.sitemap);
  *
  */
 app.post('/completed-challenge', function (req, res, done) {
-    req.user.challengesHash[parseInt(req.body.challengeNumber)] =
-        Math.round(+new Date() / 1000);
-    var timestamp = req.user.challengesHash;
-    var points = 0;
-    for (var key in timestamp) {
-        if (timestamp[key] > 0 && req.body.challengeNumber < 54) {
-            points += 1;
-        }
+  req.user.challengesHash[parseInt(req.body.challengeNumber)] =
+    Math.round(+new Date() / 1000);
+  var timestamp = req.user.challengesHash;
+  var points = 0;
+  for (var key in timestamp) {
+    if (timestamp[key] > 0 && req.body.challengeNumber < 54) {
+      points += 1;
     }
-    req.user.points = points;
-    req.user.save(function(err) {
-      if (err) { return done(err); }
-      res.status(200).send({ msg: 'progress saved' });
-    });
+  }
+  req.user.points = points;
+  req.user.save(function(err) {
+    if (err) { return done(err); }
+    res.status(200).send({ msg: 'progress saved' });
+  });
 });
 
 /**
@@ -525,60 +527,60 @@ app.post('/completed-challenge', function (req, res, done) {
  */
 
 var passportOptions = {
-    successRedirect: '/',
-    failureRedirect: '/login'
+  successRedirect: '/',
+  failureRedirect: '/login'
 };
 
 app.get('/auth/twitter', passport.authenticate('twitter'));
 app.get(
-    '/auth/twitter/callback',
-    passport.authenticate('twitter', {
-        successRedirect: '/',
-        failureRedirect: '/login'
-    })
+  '/auth/twitter/callback',
+  passport.authenticate('twitter', {
+    successRedirect: '/',
+    failureRedirect: '/login'
+  })
 );
 
 app.get(
-    '/auth/linkedin',
-    passport.authenticate('linkedin', {
-        state: 'SOME STATE'
-    })
+  '/auth/linkedin',
+  passport.authenticate('linkedin', {
+    state: 'SOME STATE'
+  })
 );
 
 app.get(
-    '/auth/linkedin/callback',
-    passport.authenticate('linkedin', passportOptions)
+  '/auth/linkedin/callback',
+  passport.authenticate('linkedin', passportOptions)
 );
 
 app.get(
-    '/auth/facebook',
-    passport.authenticate('facebook', {scope: ['email', 'user_location']})
+  '/auth/facebook',
+  passport.authenticate('facebook', {scope: ['email', 'user_location']})
 );
 
 app.get(
-    '/auth/facebook/callback',
-    passport.authenticate('facebook', passportOptions), function (req, res) {
-        res.redirect(req.session.returnTo || '/');
-    }
+  '/auth/facebook/callback',
+  passport.authenticate('facebook', passportOptions), function (req, res) {
+    res.redirect(req.session.returnTo || '/');
+  }
 );
 
 app.get('/auth/github', passport.authenticate('github'));
 app.get(
-    '/auth/github/callback',
-    passport.authenticate('github', passportOptions), function (req, res) {
-        res.redirect(req.session.returnTo || '/');
-    }
+  '/auth/github/callback',
+  passport.authenticate('github', passportOptions), function (req, res) {
+    res.redirect(req.session.returnTo || '/');
+  }
 );
 
 app.get(
-    '/auth/google',
-    passport.authenticate('google', {scope: 'profile email'})
+  '/auth/google',
+  passport.authenticate('google', {scope: 'profile email'})
 );
 app.get(
-    '/auth/google/callback',
-    passport.authenticate('google', passportOptions), function (req, res) {
-        res.redirect(req.session.returnTo || '/');
-    }
+  '/auth/google/callback',
+  passport.authenticate('google', passportOptions), function (req, res) {
+    res.redirect(req.session.returnTo || '/');
+  }
 );
 
 app.get('/induce-vomiting', function(req, res, next) {
@@ -587,8 +589,8 @@ app.get('/induce-vomiting', function(req, res, next) {
 
 // put this route last
 app.get(
-    '/:username',
-    userController.returnUser
+  '/:username',
+  userController.returnUser
 );
 
 /**
@@ -614,15 +616,16 @@ if (process.env.NODE_ENV === 'development') {
     var accept = accepts(req);
     var type = accept.type('html', 'json', 'text');
 
-    var message = 'opps! Something went wrong. Please try again later';
+    var message = 'oops! Something went wrong. Please try again later.';
+    debug('ERROR!!', err);
     if (type === 'html') {
       req.flash('errors', { msg: message });
       return res.redirect('/');
-    // json
+      // json
     } else if (type === 'json') {
       res.setHeader('Content-Type', 'application/json');
       return res.send({ message: message });
-    // plain text
+      // plain text
     } else {
       res.setHeader('Content-Type', 'text/plain');
       return res.send(message);
@@ -634,11 +637,11 @@ if (process.env.NODE_ENV === 'development') {
  * Start Express server.
  */
 app.listen(app.get('port'), function () {
-    console.log(
-        'FreeCodeCamp server listening on port %d in %s mode',
-        app.get('port'),
-        app.get('env')
-    );
+  console.log(
+    'FreeCodeCamp server listening on port %d in %s mode',
+    app.get('port'),
+    app.get('env')
+  );
 });
 
 module.exports = app;

From a6d572145818f0b238a08202398db34ea6aae9b1 Mon Sep 17 00:00:00 2001
From: brndnb <branden@fermup.com>
Date: Tue, 14 Apr 2015 15:42:46 -0400
Subject: [PATCH 15/24] Switch from debug to console.log

---
 app.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 6b3df71c96c..1833ad267d2 100644
--- a/app.js
+++ b/app.js
@@ -32,7 +32,6 @@ var express = require('express'),
   expressValidator = require('express-validator'),
   connectAssets = require('connect-assets'),
   request = require('request'),
-  debug = require('debug')('freecc:app');
 
 
   /**
@@ -617,7 +616,7 @@ if (process.env.NODE_ENV === 'development') {
     var type = accept.type('html', 'json', 'text');
 
     var message = 'oops! Something went wrong. Please try again later.';
-    debug('ERROR!!', err);
+    console.log('ERROR!!', err);
     if (type === 'html') {
       req.flash('errors', { msg: message });
       return res.redirect('/');

From 18bdefbfac37cb0bee45c8716b16561359d61e2f Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 14 Apr 2015 16:17:58 -0400
Subject: [PATCH 16/24] Add in message about twitter authorization being down
 temporarily to error handler

---
 app.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 1833ad267d2..729bfdb8ff7 100644
--- a/app.js
+++ b/app.js
@@ -615,7 +615,10 @@ if (process.env.NODE_ENV === 'development') {
     var accept = accepts(req);
     var type = accept.type('html', 'json', 'text');
 
-    var message = 'oops! Something went wrong. Please try again later.';
+    var message = 'oops! Something went wrong. Please try again later.' +
+      ' Twitter authentication is currently unavailable for FreeCodeCamp.' +
+      ' We are working with Twitter to restore functionality' +
+      ' as soon as possible.';
     console.log('ERROR!!', err);
     if (type === 'html') {
       req.flash('errors', { msg: message });

From 4b9be16b2456d109fa3a5aa3b65ad0eb50ee4496 Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Tue, 14 Apr 2015 13:44:17 -0700
Subject: [PATCH 17/24] remove inspectlet thinking this may be the malware
 twitter is finding

---
 views/partials/universal-head.jade | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/views/partials/universal-head.jade b/views/partials/universal-head.jade
index d0c6ec57f3d..10308e00655 100644
--- a/views/partials/universal-head.jade
+++ b/views/partials/universal-head.jade
@@ -14,20 +14,4 @@ script.
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
     ga('create', 'UA-55446531-1', 'auto');
     ga('require', 'displayfeatures');
-    ga('send', 'pageview');
-script#inspectletjs(type='text/javascript').
-    window.__insp = window.__insp || [];
-    __insp.push(['wid', 561999918]);
-    (function() {
-        function __ldinsp() {
-            var insp = document.createElement('script');
-            insp.type = 'text/javascript';
-            insp.async = true;
-            insp.id = "inspsync";
-            insp.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://cdn.inspectlet.com/inspectlet.js';
-            var x = document.getElementsByTagName('script')[0];
-            x.parentNode.insertBefore(insp, x);
-        }
-        if (window.attachEvent) window.attachEvent('onload', __ldinsp);
-        else window.addEventListener('load', __ldinsp, false);
-    })();
\ No newline at end of file
+    ga('send', 'pageview');
\ No newline at end of file

From be00c7e402edc945321eb123d5fd10f212706fec Mon Sep 17 00:00:00 2001
From: Michael Q Larson <michaelqlarson@gmail.com>
Date: Tue, 14 Apr 2015 16:03:27 -0700
Subject: [PATCH 18/24] Revert "remove inspectlet thinking this may be the
 malware twitter is finding"

This reverts commit 4b9be16b2456d109fa3a5aa3b65ad0eb50ee4496.
---
 views/partials/universal-head.jade | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/views/partials/universal-head.jade b/views/partials/universal-head.jade
index 10308e00655..d0c6ec57f3d 100644
--- a/views/partials/universal-head.jade
+++ b/views/partials/universal-head.jade
@@ -14,4 +14,20 @@ script.
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
     ga('create', 'UA-55446531-1', 'auto');
     ga('require', 'displayfeatures');
-    ga('send', 'pageview');
\ No newline at end of file
+    ga('send', 'pageview');
+script#inspectletjs(type='text/javascript').
+    window.__insp = window.__insp || [];
+    __insp.push(['wid', 561999918]);
+    (function() {
+        function __ldinsp() {
+            var insp = document.createElement('script');
+            insp.type = 'text/javascript';
+            insp.async = true;
+            insp.id = "inspsync";
+            insp.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://cdn.inspectlet.com/inspectlet.js';
+            var x = document.getElementsByTagName('script')[0];
+            x.parentNode.insertBefore(insp, x);
+        }
+        if (window.attachEvent) window.attachEvent('onload', __ldinsp);
+        else window.addEventListener('load', __ldinsp, false);
+    })();
\ No newline at end of file

From 9c67d4988f8166acd15e5617b9896928e815a571 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 14 Apr 2015 23:04:54 -0400
Subject: [PATCH 19/24] Add new currying challenge to bonfires and allow
 inspectlet through protective helmet

---
 app.js                                 |  4 +-
 public/js/lib/bonfire/bonfireInit.js   |  2 +-
 public/js/lib/bonfire/plugin_v0.1.4.js | 82 ------------------------
 public/js/lib/bonfire/plugin_v0.1.5.js | 88 ++++++++++++++++++++++++++
 seed_data/bonfireMDNlinks.js           |  7 +-
 seed_data/bonfires.json                | 17 +++++
 views/bonfire/show.jade                |  2 +-
 7 files changed, 114 insertions(+), 88 deletions(-)
 delete mode 100644 public/js/lib/bonfire/plugin_v0.1.4.js
 create mode 100644 public/js/lib/bonfire/plugin_v0.1.5.js

diff --git a/app.js b/app.js
index 729bfdb8ff7..73e19ad850f 100644
--- a/app.js
+++ b/app.js
@@ -158,7 +158,9 @@ var trusted = [
   'wss://hub.togetherjs.com',
   '*.ytimg.com',
   'wss://fcctogether.herokuapp.com',
-  '*.bitly.com'
+  '*.bitly.com',
+  'http://cdn.inspectlet.com/',
+  'http://hn.inspectlet.com/'
 ];
 
 app.use(helmet.contentSecurityPolicy({
diff --git a/public/js/lib/bonfire/bonfireInit.js b/public/js/lib/bonfire/bonfireInit.js
index 2100c87a3f3..55c80ea99da 100644
--- a/public/js/lib/bonfire/bonfireInit.js
+++ b/public/js/lib/bonfire/bonfireInit.js
@@ -67,7 +67,7 @@ var requests;
 // (re)initializes the plugin
 var reset = function() {
     requests = 0;
-    plugin = new jailed.Plugin(path+'plugin_v0.1.4.js', api);
+    plugin = new jailed.Plugin(path+'plugin_v0.1.5.js', api);
     plugin.whenDisconnected( function() {
         // give some time to handle the last responce
         setTimeout( function() {
diff --git a/public/js/lib/bonfire/plugin_v0.1.4.js b/public/js/lib/bonfire/plugin_v0.1.4.js
deleted file mode 100644
index f71c0d34f14..00000000000
--- a/public/js/lib/bonfire/plugin_v0.1.4.js
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// executes the given code and handles the result
-var run = function(code) {
-    var result = {
-        input: code,
-        output: null,
-        error: null,
-        type: null
-    };
-
-    try {
-        var codeExec = runHidden(code);
-        result.type = typeof codeExec;
-        result.output = stringify(codeExec);
-    } catch(e) {
-        result.error = e.message;
-    }
-
-    application.remote.output(result);
-    self.close();
-};
-
-
-// protects even the worker scope from being accessed
-var runHidden = function(code) {
-
-    var importScript = function(url) {
-        var error = null;
-        try {
-            importScripts(url);
-        } catch (e) {
-            error = e;
-            console.log('Unable to load ramda!');
-        }
-    };
-    var indexedDB = null;
-    var location = null;
-    var navigator = null;
-    var onerror = null;
-    var onmessage = null;
-    var performance = null;
-    var self = null;
-    var webkitIndexedDB = null;
-    var postMessage = null;
-    var close = null;
-    var openDatabase = null;
-    var openDatabaseSync = null;
-    var webkitRequestFileSystem = null;
-    var webkitRequestFileSystemSync = null;
-    var webkitResolveLocalFileSystemSyncURL = null;
-    var webkitResolveLocalFileSystemURL = null;
-    var addEventListener = null;
-    var dispatchEvent = null;
-    var removeEventListener = null;
-    var dump = null;
-    var onoffline = null;
-    var ononline = null;
-    importScript("https://cdn.jsdelivr.net/ramda/0.10.0/ramda.min.js");
-    var _ = R;
-
-
-    return eval(code);
-}
-
-
-// converts the output into a string
-var stringify = function(output) {
-    var result;
-
-    if (typeof output == 'undefined') {
-        result = 'undefined';
-    } else if (output === null) {
-        result = 'null';
-    } else {
-        result = JSON.stringify(output) || output.toString();
-    }
-
-    return result;
-}
-
-
-application.setInterface({run:run});
diff --git a/public/js/lib/bonfire/plugin_v0.1.5.js b/public/js/lib/bonfire/plugin_v0.1.5.js
new file mode 100644
index 00000000000..9e63a18b88d
--- /dev/null
+++ b/public/js/lib/bonfire/plugin_v0.1.5.js
@@ -0,0 +1,88 @@
+
+// executes the given code and handles the result
+var run = function(code) {
+  var result = {
+    input: code,
+    output: null,
+    error: null,
+    type: null
+  };
+
+  try {
+    var codeExec = runHidden(code);
+    result.type = typeof codeExec;
+    result.output = stringify(codeExec);
+  } catch(e) {
+    result.error = e.message;
+  }
+
+  application.remote.output(result);
+  self.close();
+};
+
+
+// protects even the worker scope from being accessed
+var runHidden = function(code) {
+
+  var importScript = function(url) {
+    var error = null;
+    try {
+      importScripts(url);
+    } catch (e) {
+      error = e;
+      console.log('Unable to load %s!', url);
+    }
+  };
+  var indexedDB = null;
+  var location = null;
+  var navigator = null;
+  var onerror = null;
+  var onmessage = null;
+  var performance = null;
+  var self = null;
+  var webkitIndexedDB = null;
+  var postMessage = null;
+  var close = null;
+  var openDatabase = null;
+  var openDatabaseSync = null;
+  var webkitRequestFileSystem = null;
+  var webkitRequestFileSystemSync = null;
+  var webkitResolveLocalFileSystemSyncURL = null;
+  var webkitResolveLocalFileSystemURL = null;
+  var addEventListener = null;
+  var dispatchEvent = null;
+  var removeEventListener = null;
+  var dump = null;
+  var onoffline = null;
+  var ononline = null;
+  importScripts(
+    "https://cdnjs.cloudflare.com/ajax/libs/ramda/0.13.0/ramda.min.js");
+  importScripts(
+    "https://cdnjs.cloudflare.com/ajax/libs/chai/2.2.0/chai.min.js"
+  )
+
+  var expect = chai.expect;
+  var assert = chai.assert;
+
+
+  return eval(code);
+}
+
+
+// converts the output into a string
+var stringify = function(output) {
+  var result;
+
+  if (typeof output == 'undefined') {
+    result = 'undefined';
+  } else if (output === null) {
+    result = 'null';
+  } else {
+    result = JSON.stringify(output) || output.toString();
+  }
+
+  return result;
+}
+
+
+application.setInterface({run:run});
diff --git a/seed_data/bonfireMDNlinks.js b/seed_data/bonfireMDNlinks.js
index 891e3076874..29bed7d4caf 100644
--- a/seed_data/bonfireMDNlinks.js
+++ b/seed_data/bonfireMDNlinks.js
@@ -1,7 +1,7 @@
 // MDN Links
 
 /* These links are for Bonfires. Each key/value pair is used to render a Bonfire with approrpiate links.
-	
+
 
 	The text of the key is what the link text will be, e.g. <a href="https://developer ...">Global Array Object</a>
 	General convention is to use the page title of the MDN reference page.
@@ -14,11 +14,12 @@ var links =
 	"Global String Object" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String",
 	"Boolean Objects" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean",
 	"RegExp" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp",
+	"Global Function Object": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function",
 	"Arguments object" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/arguments",
 
 	// =========  PROPERTIES/MISC
 	"String.length" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/length",
-	
+
 
 	// ========== OBJECT METHODS
 	"Object.getOwnPropertyNames()" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/getOwnPropertyNames",
@@ -68,7 +69,7 @@ var links =
 	"Math.min()" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min",
 	"Math.pow()" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/pow",
 	"Remainder" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Arithmetic_Operators#Remainder_(.25)",
-	
+
 	// ======== GENERAL JAVASCRIPT REFERENCES
 	"Arithmetic Operators" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Arithmetic_Operators",
 	"Comparison Operators" : "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators",
diff --git a/seed_data/bonfires.json b/seed_data/bonfires.json
index 2a9a396b99c..2ee74a11d95 100644
--- a/seed_data/bonfires.json
+++ b/seed_data/bonfires.json
@@ -562,6 +562,23 @@
     ],
     "MDNlinks" : ["Object.hasOwnProperty()", "Object.getOwnPropertyNames()"]
   },
+  {
+    "_id": "a97fd23d9b809dac9921074f",
+    "name": "Arguments Optional",
+    "difficulty": "2.22",
+    "description": [
+      "Create a function that sums two arguments together. If only one argument is provided, return a function that expects one additional argument and will return the sum.",
+      "For example, add(2, 3) should return 5, and add(2) should return a function that is waiting for an argument so that <code>var sum2And = add(2); return sum2And(3); // 5</code>",
+      "If either argument isn't a valid numbers, return undefined"
+    ],
+    "challengeSeed": "function add() {\n  return false;\n}\n\nadd(2,3);",
+    "tests": [
+      "expect(add(2, 3)).to.equal(5);",
+      "expect(add(2)(3)).to.equal(5);",
+      "expect(add('http://bit.ly/IqT6zt')).to.be.undefined;"
+    ],
+    "MDNlinks": ["Global Function Object", "Arguments object"]
+  },
   {
     "_id": "a2f1d72d9b908d0bd72bb9f6",
     "name": "Make a Person",
diff --git a/views/bonfire/show.jade b/views/bonfire/show.jade
index 6c9997d4b43..071acd1d0b5 100644
--- a/views/bonfire/show.jade
+++ b/views/bonfire/show.jade
@@ -15,7 +15,7 @@ block content
     script(src='/js/lib/codemirror/mode/javascript/javascript.js')
     script(src='/js/lib/jailed/jailed.js')
     script(src='/js/lib/bonfire/bonfireInit.js')
-    script(src="https://cdn.jsdelivr.net/ramda/0.10.0/ramda.min.js")
+    script(src="//cdnjs.cloudflare.com/ajax/libs/ramda/0.13.0/ramda.min.js")
 
 
     .row

From b9372b9af6809b7cdd3bd118d0d0be9eebab231a Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 17 Apr 2015 00:39:48 -0400
Subject: [PATCH 20/24] Resolve merge conflicts using Webstorm's merge
 integration tool. v2

---
 app.js                   | 22 +++++-----------------
 controllers/resources.js |  7 -------
 controllers/story.js     | 10 ----------
 gulpfile.js              |  2 +-
 4 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/app.js b/app.js
index 0a5f9e23590..d3ebb53dbb8 100644
--- a/app.js
+++ b/app.js
@@ -370,11 +370,11 @@ app.post(
   passportConf.isAuthenticated,
   contactController.postDoneWithFirst100Hours
 );
-app.get(
-  '/nonprofit-project-instructions',
-  passportConf.isAuthenticated,
-  resourcesController.nonprofitProjectInstructions
-);
+//app.get(
+//  '/nonprofit-project-instructions',
+//  passportConf.isAuthenticated,
+//  resourcesController.nonprofitProjectInstructions
+//);
 app.post(
   '/update-progress',
   passportConf.isAuthenticated,
@@ -521,18 +521,6 @@ app.post(
   storyController.upvote
 );
 
-/**
- * Challenge related routes
- */
-app.get(
-  '/challenges/',
-  challengesController.returnNextChallenge
-);
-app.get(
-  '/challenges/:challengeNumber',
-  challengesController.returnChallenge
-);
-
 app.all('/account', passportConf.isAuthenticated);
 
 app.get('/account/api', userController.getAccountAngular);
diff --git a/controllers/resources.js b/controllers/resources.js
index b8171ebf214..f690ce4d9e5 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -149,13 +149,6 @@ module.exports = {
     var date1 = new Date("10/15/2014");
     var date2 = new Date();
 
-
-    livePairProgramming: function(req, res) {
-        res.render('resources/live-pair-programming', {
-            title: 'Live Pair Programming'
-        });
-    },
-
     var timeDiff = Math.abs(date2.getTime() - date1.getTime());
     var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
     var announcements = resources.announcements;
diff --git a/controllers/story.js b/controllers/story.js
index fc0e58862c1..34b86938901 100644
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -359,16 +359,6 @@ exports.storySubmission = function(req, res, next) {
     });
 };
 
-  story.save(function(err) {
-    if (err) {
-      return next(err);
-    }
-    res.send(JSON.stringify({
-      storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase()
-    }));
-  });
-};
-
 exports.commentSubmit = function(req, res, next) {
   var data = req.body.data;
   if (req.user._id.toString() !== data.author.userId.toString()) {
diff --git a/gulpfile.js b/gulpfile.js
index 90426b048e2..4faab8e3add 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -68,4 +68,4 @@ gulp.task('lint', function() {
   .pipe(eslint.format());
 });
 
-gulp.task('default', ['lint', 'serve', 'sync']);
+gulp.task('default', ['serve', 'sync']);

From f1acc59f8204d9feb01e6e84204bbb80047b1f4a Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 17 Apr 2015 01:39:55 -0400
Subject: [PATCH 21/24] Fix bug where users could get points for completing the
 same challenge.

---
 controllers/resources.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/resources.js b/controllers/resources.js
index f690ce4d9e5..5b5026bd17d 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -98,7 +98,7 @@ module.exports = {
 
   chat: function chat(req, res) {
     if (req.user && req.user.progressTimestamps.length > 5) {
-      res.redirect('http://gitter.im/freecodecamp/freecodecamp');
+      res.redirect('http://freecode.slack.com');
     } else {
       res.render('resources/chat', {
         title: "Watch us code live on Twitch.tv"

From edefd90268f767fce2009f8f8b6e66444afc9653 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 17 Apr 2015 01:40:32 -0400
Subject: [PATCH 22/24] Fix bug where users could get points for completing the
 same challenge.

---
 controllers/courseware.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/courseware.js b/controllers/courseware.js
index 08cb36a6800..72b23b3cf6d 100644
--- a/controllers/courseware.js
+++ b/controllers/courseware.js
@@ -258,7 +258,7 @@ exports.completedCourseware = function (req, res, next) {
   });
   var index = req.user.completedCoursewares.indexOf(coursewareHash);
 
-  if (index === -1) {
+  if (index > -1) {
     req.user.progressTimestamps.push(Date.now() || 0);
     req.user.uncompletedCoursewares.splice(index, 1);
   }

From dbc99eafb63dae2cf2efb7d425e13efe97df0ab1 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 17 Apr 2015 01:41:01 -0400
Subject: [PATCH 23/24] Update chat link and copy.

---
 seed_data/coursewares.json | 15 ++++++++-------
 views/partials/navbar.jade |  5 ++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/seed_data/coursewares.json b/seed_data/coursewares.json
index 8d4fda165fc..07e2ada1818 100644
--- a/seed_data/coursewares.json
+++ b/seed_data/coursewares.json
@@ -41,16 +41,17 @@
     "_id": "bd7125d8c441eddfaeb5bd0f",
     "name": "Join Our Chat Room",
     "difficulty": 0.03,
-    "challengeSeed": "114627322",
+    "challengeSeed": "124555254",
     "description": [
-      "Now we're going to join the Free Code Camp chat room. You can come here any time of day to hang out, ask questions and get help.",
-      "If you don't already have a GitHub account, create one real quick at <a href='https://www.github.com' target='_blank'>https://www.github.com</a>.",
-      "Be sure to update your biographical information and upload an image. A picture of your face works best. This is how people will see you in the chat room, so put your best foot forward.",
-      "Now enter the chat room by going to <a href='https://gitter.im/FreeCodeCamp/FreeCodeCamp' target='_blank'>https://gitter.im/FreeCodeCamp/FreeCodeCamp</a> and clicking the \"sign in with GitHub\" button.",
-      "Introduce yourself to our chat room by typing: \"hello world!\".",
+      "Now we're going to join the Free Code Camp chat room. You can come here any time of day to hang out, ask questions, or find another camper to pair program with.",
+      "Make sure your Free Code Camp account includes your email address. You can do this here: <a href='/account' target='_blank'>http://freecodecamp.com/account</a>.",
+      "Click this link, which will email you an invite to Free Code Camp's Slack chat room: <a href='/api/slack' target='_blank'>http://freecodecamp.com/api/slack</a>.",
+      "Now check your email and click the link in the email from Slack",
+      "Complete the sign up process, then update your biographical information and upload an image. A picture of your face works best. This is how people will see you in the chat room, so put your best foot forward.",
+      "Now enter the general chat room and introduce yourself to our chat room by typing: \"hello world!\".",
       "Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
       "Keep the chat room open while you work through the other challenges. That way you ask for help if you get stuck on a challenge. You can also socialize when you feel like taking a break.",
-      "You can also access this chatroom by clicking the \"Chat\" button in the upper right hand corner."
+      "You can also access this chat room by clicking the \"Chat\" button in the upper right hand corner."
     ],
     "challengeType": 2,
     "tests": []
diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade
index 3354c83e46b..89ebadcb94c 100644
--- a/views/partials/navbar.jade
+++ b/views/partials/navbar.jade
@@ -11,8 +11,7 @@
         img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg.gz', alt='learn to code javascript at Free Code Camp logo')
 .collapse.navbar-collapse
     ul.nav.navbar-nav.navbar-right.hamburger-dropdown
-        li
-            a(href='/challenges') Challenges
+
         li
             a(href='/map') Map
 
@@ -21,7 +20,7 @@
                 a(href='/chat', target='_blank') Chat
         else
             li
-                a(href='/challenges/01') Chat
+                a(href='/challenges/join-our-chat-room') Chat
         li
             a(href='/stories/hot') News
         li

From 04d9856d4fd88d897d08cf50bc24ea8d038bba65 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 17 Apr 2015 01:48:06 -0400
Subject: [PATCH 24/24] Remove vomit route.

---
 app.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app.js b/app.js
index d3ebb53dbb8..5c6835918ce 100644
--- a/app.js
+++ b/app.js
@@ -675,10 +675,6 @@ app.get(
   }
 );
 
-app.get('/induce-vomiting', function(req, res, next) {
-  next(new Error('vomiting induced'));
-});
-
 // put this route last
 app.get(
   '/:username',