From f50cee119cb76dc6a8ccdda61f6c5a9ffa9dab16 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 17:26:37 +0200
Subject: [PATCH 01/17] More 'Convert HTML Entities' test cases. Fixes #924

---
 seed/challenges/basic-bonfires.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index df4b6bc16c..9858ca9b90 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -1104,6 +1104,10 @@
       ],
       "tests": [
         "assert.strictEqual(convert('Dolce & Gabbana'), 'Dolce &amp; Gabbana', 'should escape characters');",
+        "assert.strictEqual(convert('Hamburgers < Pizza < Tacos'), 'Hamburgers &lt; Pizza &lt; Tacos', 'should escape characters');",
+        "assert.strictEqual(convert('Sixty > twelve'), 'Sixty &gt; twelve', 'should escape characters');",
+        "assert.strictEqual(convert('Stuff in \"quotation marks\"'), 'Stuff in &quot;quotation marks&quot;', 'should escape characters');",
+        "assert.strictEqual(convert(\"Shindler's List\"), 'Shindler&apos;s List', 'should escape characters');",
         "assert.strictEqual(convert('abc'), 'abc', 'should handle strings with nothing to escape');"
       ],
       "MDNlinks": [

From 00c1cdef5b3fd0ea78e1ab9ad9ecb0555113b008 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 17:43:52 +0200
Subject: [PATCH 02/17] Fixed Zipline jQuery.getJSON() links. Fixes #918 #919

---
 seed/challenges/ziplines.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/seed/challenges/ziplines.json b/seed/challenges/ziplines.json
index f61a96280e..4bf2d531db 100644
--- a/seed/challenges/ziplines.json
+++ b/seed/challenges/ziplines.json
@@ -56,7 +56,7 @@
         "<span class='text-info'>Hint:</span> Here's an example call to Twitch.tv's JSON API: <code>https://api.twitch.tv/kraken/streams/freecodecamp</code>.",
         "<span class='text-info'>Hint:</span> The relevant documentation about this API call is here: <a href='https://github.com/justintv/Twitch-API/blob/master/v3_resources/streams.md#get-streamschannel' target='_blank'>https://github.com/justintv/Twitch-API/blob/master/v3_resources/streams.md#get-streamschannel</a>.",
         "<span class='text-info'>Hint:</span> Here's an array of the Twitch.tv usernames of people who regularly stream coding: <code>[\"freecodecamp\", \"storbeck\", \"terakilobyte\", \"habathcx\",\"RobotCaleb\",\"comster404\",\"brunofin\",\"thomasballinger\",\"noobs2ninjas\",\"beohoff\"]</code>",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],
@@ -87,7 +87,7 @@
         "Here are the <a href='http://en.wikipedia.org/wiki/User_story' target='_blank'>user stories</a> you must enable, and optional bonus user stories:",
         "<span class='text-info'>User Story:</span> As a user, I can click a button to show me a new random quote.",
         "<span class='text-info'>Bonus User Story:</span> As a user, I can press a button to tweet out a quote.",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],
@@ -120,7 +120,7 @@
         "<span class='text-info'>Bonus User Story:</span> As a user, I can see an icon depending on the temperature..",
         "<span class='text-info'>Bonus User Story:</span> As a user, I see a different background image depending on the temperature (e.g. snowy mountain, hot desert).",
         "<span class='text-info'>Bonus User Story:</span> As a user, I can push a button to toggle between Fahrenheit and Celsius.",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],
@@ -154,7 +154,7 @@
         "<span class='text-info'>User Story:</span> As a user, I can click a link to go directly to the post's discussion page.",
         "<span class='text-info'>Bonus User Story:</span> As a user, I can see how many upvotes each story has.",
         "<span class='text-info'>Hint:</span> Here's the Camper News Hot Stories API endpoint: <code>http://www.freecodecamp.com/stories/hotStories</code>.",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],
@@ -187,7 +187,7 @@
         "<span class='text-info'>Bonus User Story:</span>As a user, I can click a button to see a random Wikipedia entry.",
         "<span class='text-info'>Bonus User Story:</span>As a user, when I type in the search box, I can see a dropdown menu with autocomplete options for matching Wikipedia entries.",
         "<span class='text-info'>Hint:</span> Here's an entry on using Wikipedia's API: <code>http://www.mediawiki.org/wiki/API:Main_page</code>.",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],

From 0038c48875a830fd8778d0391b0641e1f8c3068f Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 18:06:09 +0200
Subject: [PATCH 03/17] Improves check for catphotoapp.com. Fixes #914

---
 seed/challenges/basic-html5-and-css.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/basic-html5-and-css.json b/seed/challenges/basic-html5-and-css.json
index 3e0532d81a..d050f4d6dc 100644
--- a/seed/challenges/basic-html5-and-css.json
+++ b/seed/challenges/basic-html5-and-css.json
@@ -1005,7 +1005,7 @@
       ],
       "tests": [
         "assert((/cat photos/gi).test($('a').text()), 'Your <code>a</code> element should have the anchor text of \"cat photos\"')",
-        "assert($('a').filter(function(index) { return /com/gi.test($('a').attr('href')); }).length > 0, 'You need an <code>a</code> element that links to <code>http&#58;//catphotoapp.com<code>.')",
+        "assert(/http:\\/\\/catphotoapp\\.com/gi.test($('a').attr('href')), 'You need an <code>a</code> element that links to <code>http&#58;//catphotoapp.com<code>.')",
         "assert(editor.match(/<\\/a>/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure your <code>a</code> element has a closing tag.')"
       ],
       "challengeSeed": [

From 480c5dec0a6627a0e4507cb8fe7dadf51260f462 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 18:14:55 +0200
Subject: [PATCH 04/17] Test for almost palindromes. #911

---
 seed/challenges/basic-bonfires.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index df4b6bc16c..cad7cb5228 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -180,7 +180,8 @@
         "assert.deepEqual(palindrome(\"not a palindrome\"), false);",
         "assert.deepEqual(palindrome(\"A man, a plan, a canal. Panama\"), true);",
         "assert.deepEqual(palindrome(\"never odd or even\"), true);",
-        "assert.deepEqual(palindrome(\"nope\"), false);"
+        "assert.deepEqual(palindrome(\"nope\"), false);",
+        "assert.deepEqual(palindrome(\"almostomla\"), false);"
       ],
       "challengeSeed": [
         "function palindrome(str) {",

From 663492c58222995850bfef3f9a8ccc2b038e0506 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 18:26:44 +0200
Subject: [PATCH 05/17] Check fix in 'Bootstrap Grid'. #907

---
 seed/challenges/bootstrap.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index eeac669f73..9f2b704153 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -626,7 +626,7 @@
         "The \"row\" class is applied to a <code>div</code>, and the buttons themselves can be wrapped within it."
       ],
       "tests": [
-        "assert($('div.row:has(button)'), 'Your buttons should all be wrapped within the same <code>div</code> element with the class \"row\".')",
+        "assert($('div.row:has(button)').length > 0, 'Your buttons should all be wrapped within the same <code>div</code> element with the class \"row\".')",
         "assert($('div.col-xs-4:has(button)').length > 2, 'Each of your Bootstrap buttons should be wrapped within its own a <code>div</code> element with the class \"col-xs-4\".')",
         "assert(editor.match(/<\\/button>/g) && editor.match(/<button/g) && editor.match(/<\\/button>/g).length === editor.match(/<button/g).length, 'Make sure each of your <code>button</code> elements has a closing tag.')",
         "assert(editor.match(/<\\/div>/g) && editor.match(/<div/g) && editor.match(/<\\/div>/g).length === editor.match(/<div/g).length, 'Make sure each of your <code>div</code> elements has a closing tag.')"

From 81ae7daff1654cf267efbfd9a9f2fb0ff60f3b45 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 12:27:28 -0700
Subject: [PATCH 06/17] fix try using oath instead of oauth2 for google

---
 server/passport-providers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/passport-providers.js b/server/passport-providers.js
index a17d59a068..b60ad8f51e 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -41,7 +41,7 @@ module.exports = {
   },
   'google-login': {
     provider: 'google',
-    authScheme: 'oauth2',
+    authScheme: 'oauth',
     module: 'passport-google-oauth2',
     clientID: process.env.GOOGLE_ID,
     clientSecret: process.env.GOOGLE_SECRET,
@@ -55,7 +55,7 @@ module.exports = {
   },
   'google-link': {
     provider: 'google',
-    authScheme: 'oauth2',
+    authScheme: 'oauth',
     module: 'passport-google-oauth2',
     clientID: process.env.GOOGLE_ID,
     clientSecret: process.env.GOOGLE_SECRET,

From 9c14e5846da7ec0497ba4f0b5bba644b46283bf1 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 13:12:35 -0700
Subject: [PATCH 07/17] add www.freecodecamp.org to trusted list

---
 server/server.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/server.js b/server/server.js
index 27ec95b289..0760aa6b08 100755
--- a/server/server.js
+++ b/server/server.js
@@ -98,6 +98,8 @@ var trusted = [
   'https://freecodecamp.com',
   'https://freecodecamp.org',
   '*.freecodecamp.org',
+  // NOTE(berks): add the following as the blob above was not covering www
+  'http://www.freecodecamp.org',
   'ws://freecodecamp.com/',
   'ws://www.freecodecamp.com/',
   '*.gstatic.com',

From 0173804e21c7038910040756e6fd9e32b6235373 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 18 Jun 2015 17:08:21 -0400
Subject: [PATCH 08/17] updates helmet policies, makes new startup script

---
 pm2Start.js                                   | 10 +++
 .../coursewaresJSFramework_0.0.5.js           | 67 ++++++++++++-------
 server/server.js                              |  3 +-
 3 files changed, 55 insertions(+), 25 deletions(-)
 create mode 100644 pm2Start.js

diff --git a/pm2Start.js b/pm2Start.js
new file mode 100644
index 0000000000..f096f0bca6
--- /dev/null
+++ b/pm2Start.js
@@ -0,0 +1,10 @@
+var pm2 = require('pm2');
+pm2.connect(function() {
+  pm2.start({
+    script: 'server/server.js',
+    exec_mode: 'fork',
+    max_memory_restart: '900M'
+  }, function(err, apps) {
+    pm2.disconnect();
+  });
+});
diff --git a/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js b/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js
index 2183c226d7..b62e752a99 100644
--- a/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js
+++ b/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js
@@ -18,7 +18,7 @@ editor.setSize("100%", "auto");
 // Hijack tab key to enter two spaces intead
 editor.setOption("extraKeys", {
   Tab: function(cm) {
-    if (cm.somethingSelected()){
+    if (cm.somethingSelected()) {
       cm.indentSelection("add");
     } else {
       var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
@@ -26,7 +26,7 @@ editor.setOption("extraKeys", {
     }
   },
   "Shift-Tab": function(cm) {
-    if (cm.somethingSelected()){
+    if (cm.somethingSelected()) {
       cm.indentSelection("subtract");
     } else {
       var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
@@ -61,7 +61,10 @@ codeOutput.setValue('/**\n' +
   ' */');
 codeOutput.setSize("100%", "100%");
 var info = editor.getScrollInfo();
-var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top;
+var after = editor.charCoords({
+  line: editor.getCursor().line + 1,
+  ch: 0
+}, "local").top;
 if (info.top + info.clientHeight < after)
   editor.scrollTo(null, after - info.clientHeight + 3);
 
@@ -83,8 +86,8 @@ editorValue = allSeeds;
 
 myCodeMirror.setValue(editorValue);
 
-function doLinting () {
-  editor.operation(function () {
+function doLinting() {
+  editor.operation(function() {
     for (var i = 0; i < widgets.length; ++i)
       editor.removeLineWidget(widgets[i]);
     widgets.length = 0;
@@ -106,14 +109,14 @@ function doLinting () {
   });
 };
 
-$('#submitButton').on('click', function () {
+$('#submitButton').on('click', function() {
   bonfireExecute();
 });
 
 function bonfireExecute() {
   attempts++;
-  ga('send', 'event',  'Challenge', 'ran-code', challenge_Name);
-  userTests= null;
+  ga('send', 'event', 'Challenge', 'ran-code', challenge_Name);
+  userTests = null;
   $('#codeOutput').empty();
   var userJavaScript = myCodeMirror.getValue();
   userJavaScript = removeComments(userJavaScript);
@@ -145,16 +148,23 @@ var scrapeTests = function(userJavaScript) {
   }
 
   var counter = 0;
-  var regex = new RegExp(/(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/);
+  var regex = new RegExp(
+    /(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/
+  );
   var match = regex.exec(userJavaScript);
   while (match != null) {
     var replacement = '//' + counter + testSalt;
-    userJavaScript = userJavaScript.substring(0, match.index) + replacement + userJavaScript.substring(match.index + match[0].length);
+    userJavaScript = userJavaScript.substring(0, match.index) + replacement +
+      userJavaScript.substring(match.index + match[0].length);
 
     if (!userTests) {
-      userTests= [];
+      userTests = [];
     }
-    userTests.push({"text": match[0], "line": counter, "err": null});
+    userTests.push({
+      "text": match[0],
+      "line": counter,
+      "err": null
+    });
     counter++;
     match = regex.exec(userJavaScript);
   }
@@ -176,17 +186,22 @@ var createTestDisplay = function() {
   if (pushed) {
     userTests.pop();
   }
-  for (var i = 0; i < userTests.length;i++) {
+  for (var i = 0; i < userTests.length; i++) {
     var test = userTests[i];
     var testDoc = document.createElement("div");
     if (test.err != null) {
       console.log('Should be displaying bad tests');
       $(testDoc)
-        .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable test-vertical-center grayed-out-test-output'>" + test.text + "</div><div class='col-xs-10 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
+        .html(
+          "<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable test-vertical-center grayed-out-test-output'>" +
+          test.text + "</div><div class='col-xs-10 test-output wrappable'>" +
+          test.err + "</div></div><div class='ten-pixel-break'/>")
         .appendTo($('#testSuite'));
     } else {
       $(testDoc)
-        .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" + test.text + "</div></div><div class='ten-pixel-break'/>")
+        .html(
+          "<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" +
+          test.text + "</div></div><div class='ten-pixel-break'/>")
         .appendTo($('#testSuite'));
     }
   };
@@ -208,18 +223,21 @@ var runTests = function(err, data) {
   pushed = false;
   $('#testSuite').children().remove();
   if (err && userTests.length > 0) {
-    userTests= [{text:"Program Execution Failure", err: "No user tests were run."}];
+    userTests = [{
+      text: "Program Execution Failure",
+      err: "No user tests were run."
+    }];
     createTestDisplay();
   } else if (userTests) {
     userTests.push(false);
     pushed = true;
-    userTests.forEach(function(chaiTestFromJSON, indexOfTestArray, __testArray){
+    userTests.forEach(function(chaiTestFromJSON, indexOfTestArray,
+      __testArray) {
       try {
         if (chaiTestFromJSON) {
           var output = eval(reassembleTest(chaiTestFromJSON, data));
-          debugger;
         }
-      } catch(error) {
+      } catch (error) {
         allTestsPassed = false;
         __testArray[indexOfTestArray].err = error.message;
       } finally {
@@ -239,12 +257,12 @@ var runTests = function(err, data) {
 
 function showCompletion() {
   var time = Math.floor(Date.now()) - started;
-  ga('send', 'event',  'Challenge', 'solved', challenge_Name + ', Time: ' + time +', Attempts: ' + attempts);
+  ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time +
+    ', Attempts: ' + attempts);
   var bonfireSolution = myCodeMirror.getValue();
   var didCompleteWith = $('#completed-with').val() || null;
   $.post(
-    '/completed-bonfire/',
-    {
+    '/completed-bonfire/', {
       challengeInfo: {
         challengeId: challenge_Id,
         challengeName: challenge_Name,
@@ -252,10 +270,11 @@ function showCompletion() {
         challengeType: challengeType,
         solution: bonfireSolution
       }
-    }, function(res) {
+    },
+    function(res) {
       if (res) {
         $('#complete-courseware-dialog').modal('show');
-        $('#complete-courseware-dialog').keydown(function (e) {
+        $('#complete-courseware-dialog').keydown(function(e) {
           if (e.ctrlKey && e.keyCode == 13) {
             $('#next-courseware-button').click();
           }
diff --git a/server/server.js b/server/server.js
index 0760aa6b08..3b6cbafa85 100755
--- a/server/server.js
+++ b/server/server.js
@@ -145,7 +145,8 @@ app.use(helmet.csp({
     '*.aspnetcdn.com',
     '*.d3js.org',
     'https://cdn.inspectlet.com/inspectlet.js',
-    'http://cdn.inspectlet.com/inspectlet.js'
+    'http://cdn.inspectlet.com/inspectlet.js',
+    'http://www.freecodecamp.org'
   ].concat(trusted),
   'connect-src': [].concat(trusted),
   styleSrc: [

From b24699a43e939028cf5b2bcc357ddcb0e6bceff4 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 18 Jun 2015 17:33:34 -0400
Subject: [PATCH 09/17] updates pm2 startup script

---
 pm2Start.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pm2Start.js b/pm2Start.js
index f096f0bca6..052f3bdbfa 100644
--- a/pm2Start.js
+++ b/pm2Start.js
@@ -1,8 +1,10 @@
 var pm2 = require('pm2');
 pm2.connect(function() {
   pm2.start({
+    name: 'server',
     script: 'server/server.js',
-    exec_mode: 'fork',
+    exec_mode: 'cluster',
+    instances: '2',
     max_memory_restart: '900M'
   }, function(err, apps) {
     pm2.disconnect();

From 4560cfed03582f59e413c7f40124d5a42b3fcc5c Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 13:16:23 -0700
Subject: [PATCH 10/17] deleted old setup file

---
 setup.js | 749 -------------------------------------------------------
 1 file changed, 749 deletions(-)
 delete mode 100644 setup.js

diff --git a/setup.js b/setup.js
deleted file mode 100644
index 652e4ce228..0000000000
--- a/setup.js
+++ /dev/null
@@ -1,749 +0,0 @@
-var fs = require('fs');
-var os = require('os');
-var blessed = require('blessed');
-var multiline = require('multiline');
-
-if (os.platform() === 'win32') {
-  console.log('**************************************************************');
-  console.log('Hackathon Starter Generator has been disabled on Windows until');
-  console.log('https://github.com/chjj/blessed is fixed or until I find a');
-  console.log('better CLI module.');
-  console.log('**************************************************************');
-  process.exit();
-}
-var screen = blessed.screen({
-  autoPadding: true
-});
-
-screen.key('q', function() {
-  process.exit(0);
-});
-
-var home = blessed.list({
-  parent: screen,
-  padding: { top: 2 },
-  mouse: true,
-  keys: true,
-  fg: 'white',
-  bg: 'blue',
-  selectedFg: 'blue',
-  selectedBg: 'white',
-  items: [
-    '» REMOVE AUTHENTICATION PROVIDER',
-    '» CHANGE EMAIL SERVICE',
-    '» ADD NODE.JS CLUSTER SUPPORT',
-    '» EXIT'
-  ]
-});
-
-var homeTitle = blessed.text({
-  parent: screen,
-  align: 'center',
-  fg: 'blue',
-  bg: 'white',
-  content: 'Hackathon Starter (c) 2014'
-});
-
-var footer = blessed.text({
-  parent: screen,
-  bottom: 0,
-  fg: 'white',
-  bg: 'blue',
-  tags: true,
-  content: ' {cyan-fg}<Up/Down>{/cyan-fg} moves |' +
-    ' {cyan-fg}<Enter>{/cyan-fg} selects | {cyan-fg}<q>{/cyan-fg} exits'
-});
-
-var inner = blessed.form({
-  top: 'center',
-  left: 'center',
-  mouse: true,
-  keys: true,
-  width: 33,
-  height: 10,
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'red'
-  },
-  fg: 'white',
-  bg: 'red'
-});
-
-var success = blessed.box({
-  top: 'center',
-  left: 'center',
-  mouse: true,
-  keys: true,
-  tags: true,
-  width: '50%',
-  height: '40%',
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'green'
-  },
-  fg: 'white',
-  bg: 'green',
-  padding: 1
-});
-
-success.on('keypress', function() {
-  home.focus();
-  home.remove(success);
-});
-
-var clusterText = blessed.text({
-  top: 'top',
-  bg: 'red',
-  fg: 'white',
-  tags: true,
-  content: 'Take advantage of multi-core systems' +
-    ' using built-in {underline}cluster{/underline} module.'
-});
-
-
-var enable = blessed.button({
-  parent: inner,
-  bottom: 0,
-  mouse: true,
-  shrink: true,
-  name: 'enable',
-  content: ' ENABLE ',
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'red'
-  },
-  style: {
-    fg: 'white',
-    bg: 'red',
-    focus: {
-      fg: 'red',
-      bg: 'white'
-    }
-  }
-});
-
-
-var disable = blessed.button({
-  parent: inner,
-  bottom: 0,
-  left: 10,
-  mouse: true,
-  shrink: true,
-  name: 'disable',
-  content: ' DISABLE ',
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'red'
-  },
-  style: {
-    fg: 'white',
-    bg: 'red',
-    focus: {
-      fg: 'red',
-      bg: 'white'
-    }
-  }
-});
-
-var cancel = blessed.button({
-  parent: inner,
-  bottom: 0,
-  left: 21,
-  mouse: true,
-  shrink: true,
-  name: 'cancel',
-  content: ' CANCEL ',
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'red'
-  },
-  style: {
-    fg: 'white',
-    bg: 'red',
-    focus: {
-      fg: 'red',
-      bg: 'white'
-    }
-  }
-});
-
-cancel.on('press', function() {
-  home.focus();
-  home.remove(inner);
-  screen.render();
-
-});
-
-var authForm = blessed.form({
-  mouse: true,
-  keys: true,
-  fg: 'white',
-  bg: 'blue',
-  padding: { left: 1, right: 1 }
-});
-
-authForm.on('submit', function() {
-  var passportConfig = fs.readFileSync('config/passport.js')
-    .toString().split(os.EOL);
-  var loginTemplate = fs.readFileSync('views/account/login.jade')
-    .toString().split(os.EOL);
-  var profileTemplate = fs.readFileSync('views/account/profile.jade')
-    .toString().split(os.EOL);
-  var userModel = fs.readFileSync('models/User.js').toString().split(os.EOL);
-  var app = fs.readFileSync('app.js').toString().split(os.EOL);
-  var secrets = fs.readFileSync('config/secrets.js').toString().split(os.EOL);
-
-  var index = passportConfig
-    .indexOf('var FacebookStrategy = require("passport-facebook").Strategy;');
-  if (facebookCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with Facebook.');
-    passportConfig.splice(index, 47);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      '      a.btn.btn-block.btn-facebook.btn-social(href="/auth/facebook")'
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.facebook');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  facebook: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf([
-      'app.get("/auth/facebook"',
-      'passport.authenticate("facebook",',
-      ' { scope: ["email", "user_location"] }));'
-    ].join(' '));
-
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    "var GitHubStrategy = require('passport-github').Strategy;"
-  );
-  if (githubCheckbox.checked && index !== -1) {
-    console.log(index);
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with GitHub.');
-    passportConfig.splice(index, 48);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      "      a.btn.btn-block.btn-github.btn-social(href='/auth/github')"
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.github');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  github: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf(
-      'app.get("/auth/github", passport.authenticate("github"));'
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    'var GoogleStrategy = require("passport-google-oauth").OAuth2Strategy;'
-  );
-  if (googleCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with Google.');
-    passportConfig.splice(index, 46);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      "      a.btn.btn-block.btn-google-plus.btn-social(href='/auth/google')"
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.google');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  google: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf(
-      'app.get("/auth/google",' +
-      ' passport.authenticate("google", { scope: "profile email" }));'
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    'var TwitterStrategy = require("passport-twitter").Strategy;'
-  );
-  if (twitterCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with Twitter.');
-    passportConfig.splice(index, 43);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      '      a.btn.btn-block.btn-twitter.btn-social(href="/auth/twitter")'
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.twitter');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade', profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  twitter: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf(
-      "app.get('/auth/twitter', passport.authenticate('twitter'));"
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    'var LinkedInStrategy = require("passport-linkedin-oauth2").Strategy;'
-  );
-  if (linkedinCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with LinkedIn.');
-    passportConfig.splice(index, 47);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      '      a.btn.btn-block.btn-linkedin.btn-social(href="/auth/linkedin")'
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.linkedin');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  linkedin: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf(
-      'app.get("/auth/linkedin",',
-      ' passport.authenticate("linkedin", { state: "SOME STATE" }));'
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    'var InstagramStrategy = require("passport-instagram").Strategy;'
-  );
-  if (instagramCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with Instagram.');
-    passportConfig.splice(index, 43);
-    fs.writeFileSync(
-      'config/passport.js',
-      passportConfig.join(os.EOL)
-    );
-
-    index = loginTemplate.indexOf(
-      '      a.btn.btn-block.btn-instagram.btn-social(href="/auth/instagram")'
-    );
-    loginTemplate.splice(index, 3);
-
-    fs.writeFileSync(
-      'views/account/login.jade',
-      loginTemplate.join(os.EOL)
-    );
-
-    index = profileTemplate.indexOf('  if user.instagram');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = app.indexOf(
-      'app.get("/auth/instagram", passport.authenticate("instagram"));'
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-  }
-
-  home.remove(authForm);
-  home.append(success);
-  success.setContent(
-    'Selected authentication providers have been removed' +
-    'from passportConfig.js, User.js, server.js, login.jade and profile.jade!'
-  );
-  success.focus();
-  screen.render();
-});
-
-var authText = blessed.text({
-  parent: authForm,
-  content: 'Selecting a checkbox removes an authentication provider.' +
-    ' If authentication provider is already removed, no action will be taken.',
-  padding: 1,
-  bg: 'magenta',
-  fg: 'white'
-});
-
-var facebookCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 6,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Facebook'
-});
-
-var githubCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 7,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'GitHub'
-});
-
-var googleCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 8,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Google'
-});
-
-var twitterCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 9,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Twitter'
-});
-
-var linkedinCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 10,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'LinkedIn'
-});
-
-var instagramCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 11,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Instagram'
-});
-
-var authSubmit = blessed.button({
-  parent: authForm,
-  top: 13,
-  mouse: true,
-  shrink: true,
-  name: 'submit',
-  content: ' SUBMIT ',
-  style: {
-    fg: 'blue',
-    bg: 'white',
-    focus: {
-      fg: 'white',
-      bg: 'red'
-    }
-  }
-});
-
-authSubmit.on('press', function() {
-  authForm.submit();
-});
-
-var authCancel = blessed.button({
-  parent: authForm,
-  top: 13,
-  left: 9,
-  mouse: true,
-  shrink: true,
-  name: 'cancel',
-  content: ' CANCEL ',
-  style: {
-    fg: 'blue',
-    bg: 'white',
-    focus: {
-      fg: 'white',
-      bg: 'red'
-    }
-  }
-});
-
-authCancel.on('press', function() {
-  home.focus();
-  home.remove(authForm);
-  screen.render();
-});
-
-var emailForm = blessed.form({
-  mouse: true,
-  keys: true,
-  fg: 'white',
-  bg: 'blue',
-  padding: { left: 1, right: 1 }
-});
-
-emailForm.on('submit', function() {
-  var contactCtrl = fs.readFileSync('controllers/contact.js')
-    .toString().split(os.EOL);
-  var userCtrl = fs.readFileSync('controllers/user.js')
-    .toString().split(os.EOL);
-  var choice = null;
-
-  if (sendgridRadio.checked) {
-    choice = 'SendGrid';
-  } else if (mailgunRadio.checked) {
-    choice = 'Mailgun';
-  } else if (mandrillRadio.checked) {
-    choice = 'Mandrill';
-  }
-
-  var index = contactCtrl.indexOf(
-    'var transporter = nodemailer.createTransport({'
-  );
-  contactCtrl.splice(index + 1, 1, "  service: '" + choice + "',");
-  contactCtrl.splice(
-    index + 3,
-    1,
-    '    user: secrets.' + choice.toLowerCase() + '.user,'
-  );
-  contactCtrl.splice(
-    index + 4,
-    1,
-    '    pass: secrets.' + choice.toLowerCase() + '.password'
-  );
-  fs.writeFileSync('controllers/contact.js', contactCtrl.join(os.EOL));
-
-  index = userCtrl.indexOf(
-    '      var transporter = nodemailer.createTransport({'
-  );
-  userCtrl.splice(index + 1, 1, "        service: '" + choice + "',");
-  userCtrl.splice(
-    index + 3,
-    1,
-    '          user: secrets.' + choice.toLowerCase() + '.user,'
-  );
-  userCtrl.splice(
-    index + 4,
-    1,
-    '          pass: secrets.' + choice.toLowerCase() + '.password'
-  );
-
-  index = userCtrl.indexOf(
-    '      var transporter = nodemailer.createTransport({',
-    (index + 1)
-  );
-  userCtrl.splice(
-    index + 1,
-    1,
-    '        service: "' + choice + '",'
-  );
-
-  userCtrl.splice(
-    index + 3,
-    1,
-    '          user: secrets.' + choice.toLowerCase() + '.user,'
-  );
-  userCtrl.splice(
-    index + 4,
-    1,
-    '          pass: secrets.' + choice.toLowerCase() + '.password'
-  );
-  fs.writeFileSync('controllers/user.js', userCtrl.join(os.EOL));
-
-  home.remove(emailForm);
-  home.append(success);
-  success.setContent('Email Service has been switched to ' + choice);
-  success.focus();
-  screen.render();
-});
-
-var emailText = blessed.text({
-  parent: emailForm,
-  content: 'Select one of the following email service providers ' +
-    'for {underline}contact form{/underline}' +
-    ' and {underline}password reset{/underline}.',
-  padding: 1,
-  bg: 'red',
-  fg: 'white',
-  tags: true
-});
-
-var sendgridRadio = blessed.radiobutton({
-  parent: emailForm,
-  top: 5,
-  checked: true,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'SendGrid'
-});
-
-var mailgunRadio = blessed.radiobutton({
-  parent: emailForm,
-  top: 6,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Mailgun'
-});
-
-var mandrillRadio = blessed.radiobutton({
-  parent: emailForm,
-  top: 7,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Mandrill'
-});
-
-var emailSubmit = blessed.button({
-  parent: emailForm,
-  top: 9,
-  mouse: true,
-  shrink: true,
-  name: 'submit',
-  content: ' SUBMIT ',
-  style: {
-    fg: 'blue',
-    bg: 'white',
-    focus: {
-      fg: 'white',
-      bg: 'red'
-    }
-  }
-});
-
-emailSubmit.on('press', function() {
-  emailForm.submit();
-});
-
-var emailCancel = blessed.button({
-  parent: emailForm,
-  top: 9,
-  left: 9,
-  mouse: true,
-  shrink: true,
-  name: 'cancel',
-  content: ' CANCEL ',
-  style: {
-    fg: 'blue',
-    bg: 'white',
-    focus: {
-      fg: 'white',
-      bg: 'red'
-    }
-  }
-});
-
-emailCancel.on('press', function() {
-  home.focus();
-  home.remove(emailForm);
-  screen.render();
-
-});
-
-home.on('select', function(child, index) {
-  switch (index) {
-    case 0:
-      home.append(authForm);
-      authForm.focus();
-      screen.render();
-      break;
-    case 1:
-      home.append(emailForm);
-      emailForm.focus();
-      break;
-    case 2:
-      addClusterSupport();
-      home.append(success);
-      success.setContent([
-        'New file {underline}cluster_app.js{/underline} has been created.',
-        'Your app is now able to use more than 1 CPU by running',
-        '{underline}node cluster_app.js{/underline}, which in turn',
-        'spawns multiple instances of {underline}server.js{/underline}'
-      ].join(' '));
-      success.focus();
-      screen.render();
-      break;
-    default:
-      process.exit(0);
-  }
-});
-
-screen.render();
-
-
-function addClusterSupport() {
-
-  var fileContents = multiline(function() {
-/*
-var os = require('os');
-var cluster = require('cluster');
-
-cluster.setupMaster({
-  exec: 'server.js'
-});
-
-cluster.on('exit', function(worker) {
-  console.log('worker ' + worker.id + ' died');
-  cluster.fork();
-});
-
-for (var i = 0; i < os.cpus().length; i++) {
-  cluster.fork();
-}
-*/
-  });
-
-  fs.writeFileSync('cluster_app.js', fileContents);
-}

From 2bf8810d794f5df8d3d8768186da3aa1067e8408 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 16:19:24 -0700
Subject: [PATCH 11/17] add pmx errorhandler in beta spot

---
 server/server.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/server.js b/server/server.js
index 3b6cbafa85..bb61e15cd3 100755
--- a/server/server.js
+++ b/server/server.js
@@ -1,5 +1,6 @@
 require('dotenv').load();
-require('pmx').init();
+var pmx = require('pmx');
+pmx.init();
 // handle uncaught exceptions. Forever will restart process on shutdown
 
 var R = require('ramda'),
@@ -20,7 +21,6 @@ var R = require('ramda'),
   path = require('path'),
   expressValidator = require('express-validator'),
   lessMiddleware = require('less-middleware'),
-  pmx = require('pmx'),
 
   passportProviders = require('./passport-providers'),
   /**
@@ -42,11 +42,11 @@ app.set('port', process.env.PORT || 3000);
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-//if (process.env.NODE_ENV === 'production') {
+// if (process.env.NODE_ENV === 'production') {
 //  app.use(forceDomain({
 //    hostname: 'www.freecodecamp.com'
 //  }));
-//}
+// }
 
 app.use(compress());
 app.use(lessMiddleware(path.join(__dirname, '/public')));
@@ -262,6 +262,8 @@ R.keys(passportProviders).map(function(strategy) {
 
 // if (process.env.NODE_ENV === 'development') {
 if (true) { // eslint-disable-line
+  // NOTE(berks): adding pmx here for Beta test. Remove for production
+  app.use(pmx.expressErrorHandler());
   app.use(errorHandler({
     log: true
   }));

From 81b77ff8adb8dabcf784a8c61276960c9f949d79 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 17:52:23 -0700
Subject: [PATCH 12/17] increase database timeout

---
 server/datasources.local.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/datasources.local.js b/server/datasources.local.js
index 03a6648e94..15efeb1c1b 100644
--- a/server/datasources.local.js
+++ b/server/datasources.local.js
@@ -3,6 +3,7 @@ var secrets = require('../config/secrets');
 module.exports = {
   db: {
     connector: 'mongodb',
+    timeout: 10000,
     url: process.env.MONGOHQ_URL
   },
   mail: {

From 28f346e830bccdab7e0332f438f9724b8adf7c00 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 19:08:39 -0700
Subject: [PATCH 13/17] fix should be connectionTimeout not timeout

---
 server/datasources.local.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/datasources.local.js b/server/datasources.local.js
index 15efeb1c1b..276a4e8dee 100644
--- a/server/datasources.local.js
+++ b/server/datasources.local.js
@@ -3,7 +3,7 @@ var secrets = require('../config/secrets');
 module.exports = {
   db: {
     connector: 'mongodb',
-    timeout: 10000,
+    connectionTimeout: 15000,
     url: process.env.MONGOHQ_URL
   },
   mail: {

From f84ac9ad12649bdfa87968d43c3c3ea9ace4fddf Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 19:55:56 -0700
Subject: [PATCH 14/17] remove forceDomain

---
 package.json     | 1 -
 server/server.js | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/package.json b/package.json
index 8213e9ac72..4863f4d47a 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,6 @@
     "express-session": "~1.9.2",
     "express-validator": "~2.8.0",
     "font-awesome": "~4.3.0",
-    "forcedomain": "~0.4.0",
     "forever": "~0.14.1",
     "frameguard": "^0.2.2",
     "github-api": "~0.7.0",
diff --git a/server/server.js b/server/server.js
index bb61e15cd3..4d59ccbe7f 100755
--- a/server/server.js
+++ b/server/server.js
@@ -42,12 +42,6 @@ app.set('port', process.env.PORT || 3000);
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-// if (process.env.NODE_ENV === 'production') {
-//  app.use(forceDomain({
-//    hostname: 'www.freecodecamp.com'
-//  }));
-// }
-
 app.use(compress());
 app.use(lessMiddleware(path.join(__dirname, '/public')));
 app.use(logger('dev'));

From adbbbf3743da0a1e2a1285f5121fc45fcb8ae458 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 20:02:32 -0700
Subject: [PATCH 15/17] fix name and dashed name switched close #975

---
 seed/challenges/basic-bonfires.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index df4b6bc16c..d2029d95b3 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -754,8 +754,8 @@
     },
     {
       "id": "a5de63ebea8dbee56860f4f2",
-      "name": "bonfire-diff-two-arrays",
-      "dashedName": "Bonfire: Diff Two Arrays",
+      "name": "Bonfire: Diff Two Arrays",
+      "dashedName": "bonfire-diff-two-arrays",
       "difficulty": "2.01",
       "description": [
         "Compare two arrays and return a new array with any items not found in both of the original arrays.",

From 938568454e94f7ed14c9bab369904cec73493237 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 19 Jun 2015 14:32:17 -0700
Subject: [PATCH 16/17] move getMDNLinks func to utils

---
 server/boot/challenge.js | 20 +++-----------------
 server/utils/index.js    | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index dfa2f98ef2..77346d15fa 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -32,27 +32,13 @@
 
 var R = require('ramda'),
   utils = require('../utils'),
-  userMigration = require('../utils/middleware').userMigration,
-  MDNlinks = require('../../seed/bonfireMDNlinks');
+  userMigration = require('../utils/middleware').userMigration;
 
 var challengeMapWithNames = utils.getChallengeMapWithNames();
 var challengeMapWithIds = utils.getChallengeMapWithIds();
 var challengeMapWithDashedNames = utils.getChallengeMapWithDashedNames();
 
-
-function getMDNlinks(links) {
-  // takes in an array of links, which are strings
-  var populatedLinks = [];
-
-  // for each key value, push the corresponding link
-  // from the MDNlinks object into a new array
-  if (links) {
-    links.forEach(function (value) {
-      populatedLinks.push(MDNlinks[value]);
-    });
-  }
-  return populatedLinks;
-}
+var getMDNLinks = utils.getMDNLinks;
 
 module.exports = function(app) {
   var router = app.loopback.Router();
@@ -295,7 +281,7 @@ module.exports = function(app) {
               bonfires: challenge,
               challengeId: challenge.id,
               MDNkeys: challenge.MDNlinks,
-              MDNlinks: getMDNlinks(challenge.MDNlinks),
+              MDNlinks: getMDNLinks(challenge.MDNlinks),
               challengeType: challenge.challengeType
             });
           }
diff --git a/server/utils/index.js b/server/utils/index.js
index 6b7b342e56..bff016241c 100644
--- a/server/utils/index.js
+++ b/server/utils/index.js
@@ -7,6 +7,7 @@ var path = require('path'),
     fs = require('fs'),
 
 
+    MDNlinks = require('../../seed/bonfireMDNlinks'),
     resources = require('./resources.json'),
     nonprofits = require('../../seed/nonprofits.json'),
     fieldGuides = require('../../seed/field-guides.json');
@@ -16,7 +17,7 @@ var path = require('path'),
  */
 var allFieldGuideIds, allFieldGuideNames, allNonprofitNames,
   challengeMap, challengeMapForDisplay, challengeMapWithIds,
-  challengeMapWithNames, allChallengeIds, allChallenges,
+  challengeMapWithNames, allChallengeIds,
   challengeMapWithDashedNames;
 
 /**
@@ -216,5 +217,18 @@ module.exports = {
         }
       });
     })();
+  },
+
+  getMDNLinks: function(links) {
+    if (!links) {
+      return [];
+    }
+    // takes in an array of links, which are strings
+
+    // for each key value, push the corresponding link
+    // from the MDNlinks object into a new array
+    return links.map(function(value) {
+      return MDNlinks[value];
+    });
   }
 };

From 12b055353e3eb6242da83652a70e2bef0404ab42 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 19 Jun 2015 14:49:10 -0700
Subject: [PATCH 17/17] remove challangeMap move to challenges router

---
 server/boot/challenge.js    | 67 ++++++++++++++++++++++++++++++-------
 server/boot/challengeMap.js | 66 ------------------------------------
 server/boot/redirects.js    |  8 +++++
 3 files changed, 62 insertions(+), 79 deletions(-)
 delete mode 100644 server/boot/challengeMap.js

diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 77346d15fa..bddf9118c4 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -45,23 +45,17 @@ module.exports = function(app) {
   var Challenge = app.models.Challenge;
   var User = app.models.User;
 
-  router.get(
-    '/challenges/next-challenge',
-    userMigration,
-    returnNextChallenge
-  );
-
-  router.get(
-    '/challenges/:challengeName',
-    userMigration,
-    returnIndividualChallenge
-  );
-
-  router.get('/challenges/', userMigration, returnCurrentChallenge);
   router.post('/completed-challenge/', completedChallenge);
   router.post('/completed-zipline-or-basejump', completedZiplineOrBasejump);
   router.post('/completed-bonfire', completedBonfire);
 
+  // the follow routes are covered by userMigration
+  router.use(userMigration);
+  router.get('/challenges/next-challenge', returnNextChallenge);
+  router.get('/challenges/:challengeName', returnIndividualChallenge);
+  router.get('/challenges/', returnCurrentChallenge);
+  router.get('/map', challengeMap);
+
   app.use(router);
 
   function returnNextChallenge(req, res, next) {
@@ -533,4 +527,51 @@ module.exports = function(app) {
       });
     }
   }
+
+  function challengeMap(req, res, next) {
+    var completedList = [];
+
+    if (req.user) {
+      completedList = req.user.completedChallenges;
+    }
+
+    var noDuplicatedChallenges = R.uniq(completedList);
+
+    var completedChallengeList = noDuplicatedChallenges
+      .map(function(challenge) {
+        // backwards compatibility
+        return (challenge.id || challenge._id);
+      });
+    var challengeList = utils.
+      getChallengeMapForDisplay(completedChallengeList);
+
+    Object.keys(challengeList).forEach(function(key) {
+      challengeList[key].completed = challengeList[key]
+        .challenges.filter(function(elem) {
+        // backwards compatibility hack
+        return completedChallengeList.indexOf(elem.id || elem._id) > -1;
+      });
+    });
+
+    function numberWithCommas(x) {
+      return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    }
+
+    var date1 = new Date('10/15/2014');
+    var date2 = new Date();
+    var timeDiff = Math.abs(date2.getTime() - date1.getTime());
+    var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
+
+    User.count(function(err, camperCount) {
+      if (err) { return next(err); }
+
+      res.render('challengeMap/show', {
+        daysRunning: daysRunning,
+        camperCount: numberWithCommas(camperCount),
+        title: "A map of all Free Code Camp's Challenges",
+        challengeList: challengeList,
+        completedChallengeList: completedChallengeList
+      });
+    });
+  }
 };
diff --git a/server/boot/challengeMap.js b/server/boot/challengeMap.js
deleted file mode 100644
index 3b7adf2489..0000000000
--- a/server/boot/challengeMap.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var R = require('ramda'),
-  // debug = require('debug')('freecc:cntr:challengeMap'),
-  utils = require('./../utils'),
-  middleware = require('../utils/middleware');
-
-
-module.exports = function(app) {
-  var User = app.models.User;
-  var router = app.loopback.Router();
-
-  router.get('/map', middleware.userMigration, challengeMap);
-  router.get('/learn-to-code', function(req, res) {
-    res.redirect(301, '/map');
-  });
-  router.get('/about', function(req, res) {
-    res.redirect(301, '/map');
-  });
-
-  app.use(router);
-
-  function challengeMap(req, res, next) {
-    var completedList = [];
-
-    if (req.user) {
-      completedList = req.user.completedChallenges;
-    }
-
-    var noDuplicatedChallenges = R.uniq(completedList);
-
-    var completedChallengeList = noDuplicatedChallenges
-      .map(function(challenge) {
-        return (challenge.id || challenge._id); // backwards compatibility
-      });
-    var challengeList = utils.
-      getChallengeMapForDisplay(completedChallengeList);
-
-    Object.keys(challengeList).forEach(function(key) {
-      challengeList[key].completed = challengeList[key]
-        .challenges.filter(function(elem) {
-        return completedChallengeList.indexOf(elem.id || elem._id) > -1;
-          //backwards compatibility hack
-      });
-    });
-
-    function numberWithCommas(x) {
-      return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-    }
-
-    var date1 = new Date('10/15/2014');
-    var date2 = new Date();
-    var timeDiff = Math.abs(date2.getTime() - date1.getTime());
-    var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
-
-    User.count(function(err, camperCount) {
-      if (err) { return next(err); }
-
-      res.render('challengeMap/show', {
-        daysRunning: daysRunning,
-        camperCount: numberWithCommas(camperCount),
-        title: "A map of all Free Code Camp's Challenges",
-        challengeList: challengeList,
-        completedChallengeList: completedChallengeList
-      });
-    });
-  }
-};
diff --git a/server/boot/redirects.js b/server/boot/redirects.js
index 8c622cb501..b07ac3b13e 100644
--- a/server/boot/redirects.js
+++ b/server/boot/redirects.js
@@ -18,5 +18,13 @@ module.exports = function(app) {
     );
   });
 
+  router.get('/learn-to-code', function(req, res) {
+    res.redirect(301, '/map');
+  });
+
+  router.get('/about', function(req, res) {
+    res.redirect(301, '/map');
+  });
+
   app.use(router);
 };