From 8424fef76f62b65b8e8a71bd49561ed9160ccb85 Mon Sep 17 00:00:00 2001
From: Arsen Melikyan <bugron@mail.ru>
Date: Sat, 19 Sep 2015 15:58:58 +0400
Subject: [PATCH 001/140] adds a switch case to highlight bonfires' code in
 GitHub issues

---
 client/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/main.js b/client/main.js
index 36aa44fe8c..7e56054143 100644
--- a/client/main.js
+++ b/client/main.js
@@ -130,6 +130,7 @@ $(document).ready(function() {
                 type = 'html';
                 break;
               case challengeTypes.JAVASCRIPT:
+              case challengeTypes.BONFIRE:
                 type = 'javascript';
                 break;
               default:

From 4c48547b0d160b90531a9fa1e2f6bc17723a67fc Mon Sep 17 00:00:00 2001
From: Joel Bentley <joel-bentley@users.noreply.github.com>
Date: Sat, 19 Sep 2015 14:50:54 -0400
Subject: [PATCH 002/140] Fix test on Waypoint Create Unordered List

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

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 8f5f48cbec..fcfe7314b7 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -1434,7 +1434,7 @@
         "assert($(\"ul\").length > 0, 'Create a <code>ul</code> element.')",
         "assert($(\"ul li\").length > 2, 'You should have three <code>li</code> elements within your <code>ul</code> element.')",
         "assert(editor.match(/<\\/ul>/g) && editor.match(/<ul/g) && editor.match(/<\\/ul>/g).length === editor.match(/<ul/g).length, 'Make sure your <code>ul</code> element has a closing tag.')",
-        "assert(editor.match(/<\\/li>/g) && editor.match(/<li>/g) && editor.match(/<\\/li>/g).length === editor.match(/<li>/g).length, 'Make sure your <code>li</code> element has a closing tag.')"
+        "assert(editor.match(/<\\/li>/g) && editor.match(/<li[\\s>]/g) && editor.match(/<\\/li>/g).length === editor.match(/<li[\\s>]/g).length, 'Make sure your <code>li</code> elements have closing tags.')"
       ],
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",

From 12ef390288288670374a2219dbaf338a85165b5d Mon Sep 17 00:00:00 2001
From: Arsen Melikyan <bugron@mail.ru>
Date: Sun, 20 Sep 2015 00:42:01 +0400
Subject: [PATCH 003/140] new test checks if all elements are nested in
 container-fluid

---
 seed/challenges/bootstrap.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index fb4f864474..2e83b66f8d 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -14,8 +14,9 @@
         "To get started, we should nest all of our HTML in a <code>div</code> element with the class <code>container-fluid</code>."
       ],
       "tests": [
-        "assert($(\"div\").hasClass(\"container-fluid\"), 'Your <code>div</code> element should have the class <code>container-fluid</code>')",
-        "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.')"
+        "assert($(\"div\").hasClass(\"container-fluid\"), 'Your <code>div</code> element should have the class <code>container-fluid</code>.')",
+        "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.')",
+        "assert($(\".container-fluid\").children().length >= 8, 'Make sure you have nested all HTML elements in <code>.container-fluid</code>.')"
       ],
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",

From 82605bbcb06f7a76be2596acd7c2da7ea6c41a8b Mon Sep 17 00:00:00 2001
From: Joel Bentley <joel-bentley@users.noreply.github.com>
Date: Sun, 20 Sep 2015 16:48:09 -0400
Subject: [PATCH 004/140] Fix test on Waypoint Use Comments to Clarify Code

---
 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 fb4f864474..9c6d924f41 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -2141,7 +2141,7 @@
       "tests": [
         "assert(editor.match(/<!--/g) && editor.match(/<!--/g).length > 0, 'Start a comment with <code>&#60;!--</code>.')",
         "assert(editor.match(/this line/g) && editor.match(/this line/g).length > 0, 'Your comment should have the text <code>You shouldn&#39;t need to modify code below this line</code>.')",
-        "assert(editor.match(/-->/g) && editor.match(/-->/g).length > 0, 'Be sure to close your comment with <code>--&#62;</code>.')"
+        "assert(editor.match(/-->.*\\n.+/g), 'Be sure to close your comment with <code>--&#62;</code>.')"
       ],
       "challengeSeed": [
         "<div class=\"container-fluid\">",

From a75db9c7f2f9490424de7d92e6a93f711a34c35f Mon Sep 17 00:00:00 2001
From: Joel Bentley <joel-bentley@users.noreply.github.com>
Date: Wed, 23 Sep 2015 18:21:16 -0400
Subject: [PATCH 005/140] Modify test to allow for blank line after comment

---
 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 9c6d924f41..927f17a6fa 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -2141,7 +2141,7 @@
       "tests": [
         "assert(editor.match(/<!--/g) && editor.match(/<!--/g).length > 0, 'Start a comment with <code>&#60;!--</code>.')",
         "assert(editor.match(/this line/g) && editor.match(/this line/g).length > 0, 'Your comment should have the text <code>You shouldn&#39;t need to modify code below this line</code>.')",
-        "assert(editor.match(/-->.*\\n.+/g), 'Be sure to close your comment with <code>--&#62;</code>.')"
+        "assert(editor.match(/-->.*\\n+.+/g), 'Be sure to close your comment with <code>--&#62;</code>.')"
       ],
       "challengeSeed": [
         "<div class=\"container-fluid\">",

From e07941936759f6dc4da0f43ba4ccb94d4692f45c Mon Sep 17 00:00:00 2001
From: ahstro <anton@lutic.org>
Date: Mon, 5 Oct 2015 18:01:28 +0200
Subject: [PATCH 006/140] Confirm the Ending: Add test case

Add a test case that makes sure the user can't just check the last
character or word.
---
 seed/challenges/basic-bonfires.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 931c157ce1..3e6b8aa1bc 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -307,6 +307,7 @@
         "assert(end(\"Connor\", \"n\") === false, 'message: <code>end(\"Connor\", \"n\")</code> should return false.');",
         "assert(end(\"Walking on water and developing software from a specification are easy if both are frozen.\", \"specification\") === false, 'message: <code>end(\"Walking on water and developing software from a specification are easy if both are frozen.\", \"specification\")</code> should return false.');",
         "assert(end(\"He has to give me a new name\", \"name\") === true, 'message: <code>end(\"He has to give me a new name\", \"name\")</code> should return true.');",
+        "assert(end(\"He has to give me a new name\", \"me\") === true, 'message: <code>end(\"He has to give me a new name\", \"me\")</code> should return true.');",
         "assert(end(\"If you want to save our world, you must hurry. We dont know how much longer we can withstand the nothing\", \"mountain\") === false, 'message: <code>end(\"If you want to save our world, you must hurry. We dont know how much longer we can withstand the nothing\", \"mountain\")</code> should return false.');"
       ],
       "MDNlinks": [

From c27e5bf6c425992b2f0afc64aa2efe8e20c2c83d Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Mon, 5 Oct 2015 21:57:15 -0700
Subject: [PATCH 007/140] start adding clementine challenge

---
 client/commonFramework.js                     |   8 +-
 seed/challenges/basejumps.json                | 130 ++++++++++++++++++
 .../front-end-development-certificate.json    |   2 +-
 .../full-stack-development-certificate.json   |   2 +-
 seed/challenges/getting-started.json          |  42 +-----
 server/views/coursewares/showStep.jade        |   5 +-
 6 files changed, 140 insertions(+), 49 deletions(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index fcb1ccc58d..01b81c7e98 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -849,15 +849,15 @@ common.init.push((function() {
     var nextStep = getNextStep($(stepClass));
     $(this)
       .parent()
-      .addClass('animated fadeOutLeft')
-      .delay(700)
+      .addClass('animated fadeOutLeft fast-animation')
+      .delay(250)
       .queue(function(next) {
         $(this).addClass('hidden');
         if (nextStep) {
           $(nextStep)
             .removeClass('hidden')
-            .addClass('animated slideInRight')
-            .delay(1000)
+            .addClass('animated slideInRight fast-animation')
+            .delay(500)
             .queue(function(next) {
               $(this).removeClass('slideInRight');
               next();
diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index c0dc0a0ba3..d003b1b5bd 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -2,6 +2,136 @@
   "name": "Full Stack JavaScript Projects",
   "order": 20,
   "challenges": [
+    {
+      "id": "560add65cb82ac38a17513c1",
+      "title": "",
+      "challengeSeed": [],
+      "description": [
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "Create an app from this github url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
+          ""
+        ],
+        [
+          "",
+          "",
+          "Create a new GitHub app.",
+          "https://github.com/settings/applications/new"
+        ],
+        [
+          "",
+          "",
+          "Return to c9.io, click the gear and click \"Show Hidden Files\"",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ],
+        [
+          "",
+          "",
+          "",
+          ""
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
+    },
+
+
     {
       "id": "bd7158d8c443eddfaeb5bcef",
       "title": "Get Set for Basejumps",
diff --git a/seed/challenges/front-end-development-certificate.json b/seed/challenges/front-end-development-certificate.json
index 351809e702..65b98018c6 100644
--- a/seed/challenges/front-end-development-certificate.json
+++ b/seed/challenges/front-end-development-certificate.json
@@ -14,7 +14,7 @@
       ],
       "description": [
         [
-          "http://i.imgur.com/luMkKst.jpg",
+          "http://i.imgur.com/syJxavV.jpg",
           "An image of our Front End Development Certificate",
           "This challenge will give you your verified Front End Development Certificate. Before we issue your certificate, we must verify that you have completed all of our basic and intermediate Bonfires, and all our basic and intermediate Ziplines. You must also accept our Academic Honesty Pledge. Click the button below to start this process.",
           ""
diff --git a/seed/challenges/full-stack-development-certificate.json b/seed/challenges/full-stack-development-certificate.json
index 7ae95c94e7..d383fc5a0f 100644
--- a/seed/challenges/full-stack-development-certificate.json
+++ b/seed/challenges/full-stack-development-certificate.json
@@ -15,7 +15,7 @@
       ],
       "description": [
         [
-          "http://i.imgur.com/qXublEe.jpg",
+          "http://i.imgur.com/sKYQhdG.jpg",
           "An image of our Full Stack Development Certificate",
           "This challenge will give you your verified Full Stack Development Certificate. Before we issue your certificate, we must verify that you have completed all of Bonfires, Ziplines and Basejumps. You must also accept our Academic Honesty Pledge. Click the button below to start this process.",
           ""
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index c35c3541f8..bd4a752c84 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -32,7 +32,7 @@
           ""
         ],
         [
-          "http://i.imgur.com/q4IjuCL.jpg",
+          "http://i.imgur.com/sKYQhdG.jpg",
           "a screenshot of our Front End Development Certificate",
           "About half way through our curriculum, you'll earn a verified Front End Development Certificate. If you can finish our entire curriculum, you'll earn a verified Full Stack Development Certificate.",
           ""
@@ -164,38 +164,6 @@
       "namePt": "",
       "descriptionPt": []
     },
-    {
-      "id": "560add65cb82ac38a17513c1",
-      "title": "Try our Wiki and Camper News",
-      "challengeSeed": [],
-      "description": [
-        [
-          "http://i.imgur.com/DoOqkNW.gif",
-          "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
-          "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/nmSiMy1.gif",
-          "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
-          "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
-          ""
-        ]
-      ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "",
-      "descriptionEs": [],
-      "namePt": "",
-      "descriptionPt": []
-    },
     {
       "id": "560add71cb82ac38a17513c2",
       "title": "Join a Campsite in Your City",
@@ -230,7 +198,7 @@
     },
     {
       "id": "560add8ccb82ac38a17513c3",
-      "title": "Join our Alumni Network and Commit to Your Goal",
+      "title": "Join our Alumni Network on LinkedIn",
       "challengeSeed": [],
       "description": [
         [
@@ -238,12 +206,6 @@
           "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
           "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
           "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
-        ],
-        [
-          "",
-          "",
-          "Free Code Camp will always be free. If you want to feel more motivated to earn our certificates faster, we encourage you to instead donate each month to a nonprofit.",
-          ""
         ]
       ],
       "type": "Waypoint",
diff --git a/server/views/coursewares/showStep.jade b/server/views/coursewares/showStep.jade
index fa8f11431a..fb375a83d3 100644
--- a/server/views/coursewares/showStep.jade
+++ b/server/views/coursewares/showStep.jade
@@ -2,14 +2,13 @@ extends ../layout-wide
 block content
     .row
         .col-md-8.col-md-offset-2
-            .jumbotron
                 for step, index in description
                     .thumbnail.challenge-step(class=index !== 0 ? 'hidden': '')
                         img.gif-block.img-center.img-responsive.thumbnail(src='#{step[0]}' alt='#{step[1]}')
                         .caption
                             p.large-p= step[2]
                         if step[3]
-                            a.btn.btn-block.btn-primary.challenge-step-btn-action(id='#{index}' href='#{step[3]}' target='_blank') Go To Link
+                            a.btn.btn-block.btn-primary.challenge-step-btn-action(id='#{index}' href='#{step[3]}' target='_blank') Open link in new tab
                         if index + 1 === description.length
                             .btn.btn-block.btn-primary.challenge-step-btn-finish(id='last' class=step[3] ? 'disabled' : '') Finish challenge
                         else
@@ -27,7 +26,7 @@ block content
                       .spacer
                       .row
                       if (user)
-                          #challenge-step-btn-submit.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter)
+                          #challenge-step-btn-submit.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge
                       else
                           a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
     script(src=rev('/js', 'commonFramework.js'))

From 91708a33162e3cd2b4c2c0da164c14b74f2e3afa Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Mon, 5 Oct 2015 22:50:09 -0700
Subject: [PATCH 008/140] Fix Waypoint: Find White Space Explaination

Changed text description to make it clear that `\s` is used to find all types of whitespace characters, not just `" "`.
Closes #2838
---
 seed/challenges/basic-javascript.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 13c28c2021..213a5f745e 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1081,10 +1081,11 @@
       "title": "Find White Space with Regular Expressions",
       "difficulty":"9.986",
       "description":[
-        "We can also use selectors like <code>\\s</code> to find spaces in a string.",
+        "We can also use selectors like <code>\\s</code> to find white space in a string.",
+        "The white space characters are <code>\" \"</code> (space), <code>\\r</code> (carriage return), <code>\\n</code> (newline), <code>\\t</code> (tab), <code>\\f</code> (form feed).",
         "It is used like this:",
         "<code>/\\s+/g</code>",
-        "Select all the spaces in the sentence string."
+        "Select all the white space characters in the sentence string."
       ],
       "tests":[
         "assert(test === 7, 'Your RegEx should have found seven spaces in the <code>testString</code>.');",

From a17687116e9b7bad14dee5c66aae7d5e19836122 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Tue, 6 Oct 2015 08:45:21 -0700
Subject: [PATCH 009/140] Fix Waypoint: Find Whitespace spelling and grammar.

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

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 213a5f745e..47790e5e0e 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1078,14 +1078,14 @@
     },
     {
       "id":"cf1111c1c12feddfaeb8bdef",
-      "title": "Find White Space with Regular Expressions",
+      "title": "Find Whitespace with Regular Expressions",
       "difficulty":"9.986",
       "description":[
-        "We can also use selectors like <code>\\s</code> to find white space in a string.",
-        "The white space characters are <code>\" \"</code> (space), <code>\\r</code> (carriage return), <code>\\n</code> (newline), <code>\\t</code> (tab), <code>\\f</code> (form feed).",
+        "We can also use selectors like <code>\\s</code> to find whitespace in a string.",
+        "The whitespace characters are <code>\" \"</code> (space), <code>\\r</code> (carriage return), <code>\\n</code> (newline), <code>\\t</code> (tab), and <code>\\f</code> (form feed).",
         "It is used like this:",
         "<code>/\\s+/g</code>",
-        "Select all the white space characters in the sentence string."
+        "Select all the whitespace characters in the sentence string."
       ],
       "tests":[
         "assert(test === 7, 'Your RegEx should have found seven spaces in the <code>testString</code>.');",

From a6789b8511eca45f46e00393002b7231631a9c37 Mon Sep 17 00:00:00 2001
From: Gaurav Saxena <gsaxena@bennettadelson.com>
Date: Tue, 6 Oct 2015 17:30:27 -0400
Subject: [PATCH 010/140] renamed -you- to -your- ; fixes #3607 - grammar bug

---
 seed/challenges/object-oriented-and-functional-programming.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index 2d8c22f32d..2da91ee5a6 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -212,7 +212,7 @@
         "<code>});</code>"
       ],
       "tests":[
-        "assert(singleVal == 30, 'message: <code>singleVal</code> should have been set to the result of you reduce operation.');",
+        "assert(singleVal == 30, 'message: <code>singleVal</code> should have been set to the result of your reduce operation.');",
         "assert(editor.getValue().match(/\\.reduce\\(/gi), 'message: You should have made use of the reduce method.');"
       ],
       "challengeSeed":[

From 33e8f35bbf7c6036a24f16b1700b2a8da1ebbcf0 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 16:39:15 -0700
Subject: [PATCH 011/140] Fix replace script tags in URL

Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
---
 client/commonFramework.js      | 76 ++++++++++++++++++++--------------
 server/boot/user.js            | 10 ++++-
 server/views/account/show.jade |  4 +-
 3 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index fcb1ccc58d..d4d86503c1 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -1,31 +1,49 @@
-// common namespace
-// all classes should be stored here
-var common = common || {
-  // init is an array of functions that are
-  // called at the beginning of dom ready
-  init: []
-};
+var common = (function() {
+  // common namespace
+  // all classes should be stored here
+  var common = window.common || {
+    // init is an array of functions that are
+    // called at the beginning of dom ready
+    init: []
+  };
 
-common.challengeName = common.challengeName || window.challenge_Name ?
-  window.challenge_Name :
-  '';
+  common.challengeName = common.challengeName || window.challenge_Name ?
+    window.challenge_Name :
+    '';
 
-common.challengeType = common.challengeType || window.challengeType ?
-  window.challengeType :
-  0;
+  common.challengeType = common.challengeType || window.challengeType ?
+    window.challengeType :
+    0;
 
-common.challengeId = common.challengeId || window.challenge_Id;
+  common.challengeId = common.challengeId || window.challenge_Id;
 
-common.challengeSeed = common.challengeSeed || window.challengeSeed ?
-  window.challengeSeed :
-  [];
+  common.challengeSeed = common.challengeSeed || window.challengeSeed ?
+    window.challengeSeed :
+    [];
 
-common.seed = common.challengeSeed.reduce(function(seed, line) {
-  return seed + line + '\n';
-}, '');
+  common.seed = common.challengeSeed.reduce(function(seed, line) {
+    return seed + line + '\n';
+  }, '');
+
+  common.replaceScriptTags = function replaceScriptTags(value) {
+    return value
+      .replace(/<script>/gi, 'fccss')
+      .replace(/<\/script>/gi, 'fcces');
+  };
+
+  common.replaceSafeTags = function replaceSafeTags(value) {
+    return value
+      .replace(/fccss/gi, '<script>')
+      .replace(/fcces/gi, '</script>');
+  };
+
+  return common;
+})();
 
 // store code in the URL
 common.codeUri = (function(common, encode, decode, location, history) {
+  var replaceScriptTags = common.replaceScriptTags;
+  var replaceSafeTags = common.replaceSafeTags;
   var codeUri = {
     encode: function(code) {
       return encode(code);
@@ -67,7 +85,7 @@ common.codeUri = (function(common, encode, decode, location, history) {
             null,
             location.href.split('?')[0]
           );
-          location.hash = '#?' + query;
+          location.hash = '#?' + replaceScriptTags(query);
         }
       } else {
         query = location.hash.replace(/^\#\?/, '');
@@ -82,13 +100,15 @@ common.codeUri = (function(common, encode, decode, location, history) {
           var key = param.split('=')[0];
           var value = param.split('=')[1];
           if (key === 'solution') {
-            return codeUri.decode(value);
+            return replaceSafeTags(codeUri.decode(value || ''));
           }
           return solution;
         }, null);
     },
     querify: function(solution) {
-      location.hash = '?solution=' + codeUri.encode(solution);
+      location.hash = '?solution=' +
+        codeUri.encode(replaceScriptTags(solution));
+
       return solution;
     }
   };
@@ -306,12 +326,6 @@ var sandBox = (function(jailed, codeOutput) {
   return sandBox;
 }(window.jailed, common.codeOutput));
 
-function replaceSafeTags(value) {
-  return value
-    .replace(/fccss/gi, '<script>')
-    .replace(/fcces/gi, '</script>');
-}
-
 var BDDregex = new RegExp(
   '(expect(\\s+)?\\(.*\\;)|' +
   '(assert(\\s+)?\\(.*\\;)|' +
@@ -416,7 +430,7 @@ var editor = (function(CodeMirror, emmetCodeMirror, common) {
         common.seed;
     }
 
-    editor.setValue(replaceSafeTags(editorValue));
+    editor.setValue(common.replaceSafeTags(editorValue));
     editor.refresh();
   });
 
@@ -659,7 +673,7 @@ function showCompletion() {
 }
 
 var resetEditor = function resetEditor() {
-  editor.setValue(replaceSafeTags(common.seed));
+  editor.setValue(common.replaceSafeTags(common.seed));
   $('#testSuite').empty();
   bonfireExecute(true);
   common.codeStorage.updateStorage();
diff --git a/server/boot/user.js b/server/boot/user.js
index a7c6fe2978..3d360f2776 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -11,6 +11,12 @@ const debug = debugFactory('freecc:boot:user');
 const daysBetween = 1.5;
 const sendNonUserToMap = ifNoUserRedirectTo('/map');
 
+function replaceScriptTags(value) {
+  return value
+    .replace(/<script>/gi, 'fccss')
+    .replace(/<\/script>/gi, 'fcces');
+}
+
 function calcCurrentStreak(cals) {
   const revCals = cals.concat([Date.now()]).slice().reverse();
   let streakBroken = false;
@@ -239,7 +245,9 @@ module.exports = function(app) {
           moment,
 
           longestStreak: profileUser.longestStreak,
-          currentStreak: profileUser.currentStreak
+          currentStreak: profileUser.currentStreak,
+
+          replaceScriptTags
         });
       }
     );
diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index 530f74b746..e48c80eff9 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -131,7 +131,7 @@ block content
                                             td.col-xs-4= bonfire.name
                                             td.col-xs-2= moment(bonfire.completedDate, 'x').format("MMM DD, YYYY")
                                             td.col-xs-6
-                                                a(href='/challenges/' + bonfire.name + '?solution=' + encodeURIComponent(bonfire.solution), target='_blank') View my solution
+                                                a(href='/challenges/' + bonfire.name + '?solution=' + encodeURIComponent(replaceScriptTags(bonfire.solution)), target='_blank') View my solution
                         if (waypoints.length > 0)
                             .col-sm-12
                                 table.table.table-striped
@@ -146,7 +146,7 @@ block content
                                             td.col-xs-2= moment(challenge.completedDate, 'x').format("MMM DD, YYYY")
                                             td.col-xs-6
                                               if (challenge.solution)
-                                                  a(href='/challenges/' + challenge.name + '?solution=' + encodeURIComponent(challenge.solution), target='_blank') View my solution
+                                                  a(href='/challenges/' + challenge.name + '?solution=' + encodeURIComponent(replaceScriptTags(challenge.solution)), target='_blank') View my solution
                                               else
                                                   a(href='/challenges/' + challenge.name) View this challenge
 

From 00b54e3d1fa0f79eaf783c18c6ba9399ee8e9de4 Mon Sep 17 00:00:00 2001
From: natac13 <sean.campbell13@gmail.com>
Date: Fri, 18 Sep 2015 18:34:37 -0400
Subject: [PATCH 012/140] added optional space to the editor match in OOP
 challenges. closes #3331

---
 .../object-oriented-and-functional-programming.json  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index 2da91ee5a6..24a6ec4a17 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -185,7 +185,7 @@
       ],
       "tests":[
         "assert.deepEqual(array, [4,5,6,7,8], 'message: You should add three to each value in the array.');",
-        "assert(editor.getValue().match(/\\.map\\(/gi), 'message: You should be making use of the map method.');",
+        "assert(editor.getValue().match(/\\.map\\s*\\(/gi), 'message: You should be making use of the map method.');",
         "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\]/gi), 'message: You should only modify the array with <code>.map</code>.');"
       ],
       "challengeSeed":[
@@ -213,7 +213,7 @@
       ],
       "tests":[
         "assert(singleVal == 30, 'message: <code>singleVal</code> should have been set to the result of your reduce operation.');",
-        "assert(editor.getValue().match(/\\.reduce\\(/gi), 'message: You should have made use of the reduce method.');"
+        "assert(editor.getValue().match(/\\.reduce\\s*\\(/gi), 'message: You should have made use of the reduce method.');"
       ],
       "challengeSeed":[
         "var array = [4,5,6,7,8];",
@@ -241,7 +241,7 @@
       ],
       "tests":[
         "assert.deepEqual(array, [1,2,3,4], 'message: You should have removed all the values from the array that are greater than 4.');",
-        "assert(editor.getValue().match(/array\\.filter\\(/gi), 'message: You should be using the filter method to remove the values from the array.');",
+        "assert(editor.getValue().match(/array\\.filter\\s*\\(/gi), 'message: You should be using the filter method to remove the values from the array.');",
         "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7\\,8\\,9\\,10\\]/gi), 'message: You should only be using <code>.filter</code> to modify the contents of the array.');"
       ],
       "challengeSeed":[
@@ -269,7 +269,7 @@
       "tests":[
         "assert.deepEqual(array, ['alpha', 'beta', 'charlie'], 'message: You should have sorted the array alphabetically.');",
         "assert(editor.getValue().match(/\\[\\'beta\\'\\,\\s\\'alpha\\'\\,\\s'charlie\\'\\];/gi), 'message: You should be sorting the array using sort.');",
-        "assert(editor.getValue().match(/\\.sort\\(\\)/gi), 'message: You should have made use of the sort method.');"
+        "assert(editor.getValue().match(/\\.sort\\s*\\(\\)/gi), 'message: You should have made use of the sort method.');"
       ],
       "challengeSeed":[
         "var array = ['beta', 'alpha', 'charlie'];",
@@ -291,7 +291,7 @@
       ],
       "tests": [
         "assert.deepEqual(array, [7,6,5,4,3,2,1], 'message: You should reverse the array.');",
-        "assert(editor.getValue().match(/\\.reverse\\(\\)/gi), 'message: You should use the reverse method.');",
+        "assert(editor.getValue().match(/\\.reverse\\s*\\(\\)/gi), 'message: You should use the reverse method.');",
         "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7/gi), 'message: You should return <code>[7,6,5,4,3,2,1]</code>.');"
       ],
       "challengeSeed": [
@@ -315,7 +315,7 @@
       ],
       "tests": [
         "assert.deepEqual(array, [1,2,3,4,5,6], 'You should concat the two arrays together.');",
-        "assert(editor.getValue().match(/\\.concat\\(/gi), 'message: You should be use the concat method to merge the two arrays.');",
+        "assert(editor.getValue().match(/\\.concat\\s*\\(/gi), 'message: You should be use the concat method to merge the two arrays.');",
         "assert(editor.getValue().match(/\\[1\\,2\\,3\\]/gi) && editor.getValue().match(/\\[4\\,5\\,6\\]/gi), 'message: You should only modify the two arrays without changing the origional ones.');"
       ],
       "challengeSeed": [

From 3f96490aff5352a00317801d189cbfba3e1bb77c Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Mon, 5 Oct 2015 22:21:46 -0700
Subject: [PATCH 013/140] Add pledge model

---
 common/models/pledge.json | 54 +++++++++++++++++++++++++++++++++++++++
 server/model-config.json  |  4 +++
 2 files changed, 58 insertions(+)
 create mode 100644 common/models/pledge.json

diff --git a/common/models/pledge.json b/common/models/pledge.json
new file mode 100644
index 0000000000..b563d4629e
--- /dev/null
+++ b/common/models/pledge.json
@@ -0,0 +1,54 @@
+{
+  "name": "pledge",
+  "base": "PersistedModel",
+  "idInjection": true,
+  "trackChanges": false,
+  "properties": {
+    "nonprofit": {
+      "type": "string"
+    },
+    "amount": {
+      "type": "number"
+    },
+    "dateStarted": {
+      "type": "date",
+      "defaultFn": "now"
+    },
+    "dateEnded": {
+      "type": "date"
+    }
+  },
+  "validations": [],
+  "relations": {
+    "camper": {
+      "type": "hasMany",
+      "model": "user"
+    }
+  },
+  "acls": [
+    {
+      "accessType": "*",
+      "principalType": "ROLE",
+      "principalId": "$everyone",
+      "permission": "DENY"
+    },
+    {
+      "accessType": "READ",
+      "principalType": "ROLE",
+      "principalId": "$everyone",
+      "permission": "ALLOW"
+    }
+  ],
+  "methods": [],
+  "indexes": {
+    "nonprofit_amount":{
+      "keys": {
+        "nonprofit": 1,
+        "amount": 1
+      },
+      "options": {
+        "unique": true
+      }
+    }
+  }
+}
diff --git a/server/model-config.json b/server/model-config.json
index 508ff05abc..c993d603df 100644
--- a/server/model-config.json
+++ b/server/model-config.json
@@ -47,6 +47,10 @@
     "dataSource": "db",
     "public": true
   },
+  "pledge": {
+    "dataSource": "db",
+    "public": true
+  },
   "user": {
     "dataSource": "db",
     "public": true

From d1c0276f4e76aaa6f1949e44319a3c4504618e4e Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Mon, 5 Oct 2015 23:08:31 -0700
Subject: [PATCH 014/140] fix spiffy up the commit form

---
 server/views/commit/index.jade | 88 ++++++++++++++++------------------
 1 file changed, 41 insertions(+), 47 deletions(-)

diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index ba15d37fc1..9b9cb73834 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -3,52 +3,46 @@ block content
     .panel.panel-info
         .panel-body
             h3.text-center Commit to yourself. Commit to a nonprofit.
-            .col-xs-12.col-sm-6.col-sm-offset-3
-                p Are you looking for a burst of motivation? Do you want to help nonprofits before you’re ready to code for them? You can do both by pledging a monthly donation to a nonprofit until you've earned either your Front End or Full Stack Development certificate. Join Commit below or click "maybe later".
-            .col-xs-12.col-sm-6.col-sm-offset-3
-                h4 Step 1: Choose your goal
-                .radio
-                    label
-                        input(type='radio' id='front-end-development-certificate' name='goal')
-                        | Front End Development Certificate (takes about 400 hours)
-                .radio
-                    label
-                        input(type='radio' id='full-stack-development-certificate' name='goal')
-                        | Full Stack Development Certificate (takes about 800 hours)
+            .row
+                .col-xs-12.col-sm-6.col-sm-offset-3
+                    p Are you looking for a burst of motivation? Do you want to help nonprofits before you’re ready to code for them? You can do both by pledging a monthly donation to a nonprofit until you've earned either your Front End or Full Stack Development certificate. Join Commit below or click "maybe later".
+            .row
+                .col-xs-12.col-sm-6.col-sm-offset-3.text-center
+                    h4 Our Featured Nonprofit
+                    a(href="http://i.imgur.com/U1CyEuA.jpg" data-lightbox="img-enlarge")
+                        img.img-responsive(src='http://i.imgur.com/U1CyEuA.jpg' alt="Girl Develop It participants coding at tables.")
+                        p Girl Develop It is a nonprofit that provides in-person classes for women to learn to code.
                 .spacer
-                h4 Step 2: Choose one of our nonprofits
+            form.form
                 .row
-                    .col-xs-12.col-sm-6
-                        a(href="http://i.imgur.com/U1CyEuA.jpg" data-lightbox="img-enlarge")
-                            img.img-responsive(src='http://i.imgur.com/U1CyEuA.jpg' alt="Girl Develop It participants coding at tables.")
-                        .radio
-                            label
-                                input(type='radio' id='girl-develop-it' name='nonprofit')
-                                | Girl Develop It is a nonprofit that provides in-person classes for women to learn to code.
-                    .col-xs-12.col-sm-6
-                        a(href="http://i.imgur.com/NERytFF.jpg" data-lightbox="img-enlarge")
-                            img.img-responsive(src='http://i.imgur.com/NERytFF.jpg' alt="Vets in Tech participants standing together at a conference.")
-                        .radio
-                            label
-                                input(type='radio' id='vets-in-tech' name='nonprofit')
-                                | Vets in Tech is a nonprofit that helps veterans prepare for tech jobs.
-                .spacer
-                h4 Step 3: Choose your monthly pledge
-                .radio
-                    label
-                        input(type='radio' id='5-dollar-pledge' name='pledge-amount')
-                        | $5 per month
-                .radio
-                    label
-                        input(type='radio' id='10-dollar-pledge' name='pledge-amount')
-                        | $10 per month
-                .radio
-                    label
-                        input(type='radio' id='50-dollar-pledge' name='pledge-amount')
-                        | $50 per month
-
-                .spacer
-                a.button.btn.btn-block.btn-primary(href='https://www.paypal.com/us/cgi-bin/webscr?cmd=_flow&SESSION=T3x0DY-bLMFXuhmjYZXs-BhmDoiXfuNh5BWad5VBcMomkkDSZY0b_-_W3HS&dispatch=5885d80a13c0db1f8e263663d3faee8d0b9dcb01a9b6dc564e45f62871326a5e') Commit
-                .button-spacer
-                a.button.btn.btn-block.btn-warning(href='/') Maybe later
-                .spacer
+                    .col-xs-12.col-sm-6.col-sm-offset-3
+                        h4 Step 1: Choose your goal
+                        .btn-group.btn-group-justified(data-toggle='buttons' role='group')
+                            label.btn.btn-info.active
+                                input(type='radio' id='front-end-development-certificate' name='goal')
+                                | Front End Development Certificate (takes about 400 hours)
+                            label.btn.btn-info
+                                input(type='radio' id='full-stack-development-certificate' name='goal')
+                                | Full Stack Development Certificate (takes about 800 hours)
+                    .spacer
+                .row
+                    .col-xs-12.col-sm-6.col-sm-offset-3
+                        h4 Step 2: Choose how much you want to donate each month
+                        .btn-group.btn-group-justified(data-toggle='buttons' role='group')
+                            label.btn.btn-primary
+                                input(type='radio' id='5-dollar-pledge' name='pledge-amount')
+                                | $5 per month
+                            label.btn.btn-primary.active
+                                input(type='radio' id='10-dollar-pledge' name='pledge-amount')
+                                | $10 per month
+                            label.btn.btn-primary
+                                input(type='radio' id='50-dollar-pledge' name='pledge-amount')
+                                | $50 per month
+                    .spacer
+                .row
+                    .col-xs-12.col-sm-6.col-sm-offset-3
+                        h4 Step 3: Commit
+                        a.btn.btn-block.btn-primary(href='https://www.girldevelopit.com/donate') Commit
+                        .button-spacer
+                        a.btn.btn-block.btn-warning(href='/') Maybe later
+                        .spacer

From bc6a9c6db24deade66515b452773a4f6cce5bf41 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 00:13:51 -0700
Subject: [PATCH 015/140] Add redirect to user page on submit

---
 client/main.js                  | 15 +++++++++++----
 server/boot/commit.js           | 31 +++++++++++++++++++++++++++++++
 server/utils/middleware.js      |  8 +++++++-
 server/views/commit/index.jade  | 22 +++++++++++++++-------
 server/views/commit/pledge.jade | 15 +++++++++++++++
 5 files changed, 79 insertions(+), 12 deletions(-)
 create mode 100644 server/views/commit/pledge.jade

diff --git a/client/main.js b/client/main.js
index c1578c1d6f..af32484411 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,12 +1,19 @@
-var mapShareKey = 'map-shares';
+var main = window.main || {};
+
+main.mapShareKey = 'map-shares';
+
 var lastCompleted = typeof lastCompleted !== 'undefined' ?
   lastCompleted :
   '';
 
 function getMapShares() {
-  var alreadyShared = JSON.parse(localStorage.getItem(mapShareKey) || '[]');
+  var alreadyShared = JSON.parse(
+    localStorage.getItem(main.mapShareKey) ||
+    '[]'
+  );
+
   if (!alreadyShared || !Array.isArray(alreadyShared)) {
-    localStorage.setItem(mapShareKey, JSON.stringify([]));
+    localStorage.setItem(main.mapShareKey, JSON.stringify([]));
     alreadyShared = [];
   }
   return alreadyShared;
@@ -23,7 +30,7 @@ function setMapShare(id) {
   if (!found) {
     alreadyShared.push(id);
   }
-  localStorage.setItem(mapShareKey, JSON.stringify(alreadyShared));
+  localStorage.setItem(main.mapShareKey, JSON.stringify(alreadyShared));
   return alreadyShared;
 }
 
diff --git a/server/boot/commit.js b/server/boot/commit.js
index a54dc19506..40203fca32 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -1,9 +1,21 @@
+import dedent from 'dedent';
+import {
+  ifNoUserRedirectTo
+} from '../utils/middleware';
+
+const sendNonUserToFront = ifNoUserRedirectTo('/');
+
 export default function commit(app) {
   const router = app.loopback.Router();
   router.get(
     '/commit',
     commitToNonprofit
   );
+  router.get(
+    '/commit/pledge',
+    sendNonUserToFront,
+    pledge
+  );
 
   app.use(router);
 
@@ -12,4 +24,23 @@ export default function commit(app) {
       title: 'Commit to a nonprofit. Commit to your goal.'
     });
   }
+
+  function pledge(req, res) {
+    const { user } = req;
+    const {
+      nonprofit = 'girl develop it',
+      amount = '5',
+      goal = 'front end certification'
+    } = req.query;
+
+    req.flash('success', {
+      msg: dedent`
+        Congratulations, you have commit to giving ${nonprofit} ${amount}
+        dollars a month until you have reached your goal
+        of completing your ${goal}
+      `
+    });
+
+    res.redirect('/' + user.username);
+  }
 }
diff --git a/server/utils/middleware.js b/server/utils/middleware.js
index 3c541cbb11..f9d4919c9b 100644
--- a/server/utils/middleware.js
+++ b/server/utils/middleware.js
@@ -1,8 +1,14 @@
-export function ifNoUserRedirectTo(url) {
+export function ifNoUserRedirectTo(url, message) {
   return function(req, res, next) {
+    const { path } = req;
     if (req.user) {
       return next();
     }
+
+    req.flash('errors', {
+      msg: message || `You must be signed to go to ${path}`
+    });
+
     return res.redirect(url);
   };
 }
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 9b9cb73834..7fd469ca1a 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -13,16 +13,18 @@ block content
                         img.img-responsive(src='http://i.imgur.com/U1CyEuA.jpg' alt="Girl Develop It participants coding at tables.")
                         p Girl Develop It is a nonprofit that provides in-person classes for women to learn to code.
                 .spacer
-            form.form
+            form.form(name='commit')
+                .hidden
+                    input(type='text' value='girl develop it' name='nonprofit')
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3
                         h4 Step 1: Choose your goal
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
                             label.btn.btn-info.active
-                                input(type='radio' id='front-end-development-certificate' name='goal')
+                                input(type='radio' id='front-end-development-certificate' value='front end certification' name='goal' checked="checked")
                                 | Front End Development Certificate (takes about 400 hours)
                             label.btn.btn-info
-                                input(type='radio' id='full-stack-development-certificate' name='goal')
+                                input(type='radio' id='full-stack-development-certificate' value='full stack certification' name='goal')
                                 | Full Stack Development Certificate (takes about 800 hours)
                     .spacer
                 .row
@@ -30,19 +32,25 @@ block content
                         h4 Step 2: Choose how much you want to donate each month
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
                             label.btn.btn-primary
-                                input(type='radio' id='5-dollar-pledge' name='pledge-amount')
+                                input(type='radio' id='5-dollar-pledge' value='5' name='amount')
                                 | $5 per month
                             label.btn.btn-primary.active
-                                input(type='radio' id='10-dollar-pledge' name='pledge-amount')
+                                input(type='radio' id='10-dollar-pledge' value='10' name='amount' checked="checked")
                                 | $10 per month
                             label.btn.btn-primary
-                                input(type='radio' id='50-dollar-pledge' name='pledge-amount')
+                                input(type='radio' id='50-dollar-pledge' value='50' name='amount')
                                 | $50 per month
                     .spacer
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3
                         h4 Step 3: Commit
-                        a.btn.btn-block.btn-primary(href='https://www.girldevelopit.com/donate') Commit
+                        a#commit-btn-submit.btn.btn-block.btn-primary(href='https://www.girldevelopit.com/donate' target='_blank') Commit
                         .button-spacer
                         a.btn.btn-block.btn-warning(href='/') Maybe later
                         .spacer
+    script.
+      $(function() {
+        $('#commit-btn-submit').click(function() {
+          window.location.href = '/commit/pledge?' + $('form').serialize();
+        });
+      });
diff --git a/server/views/commit/pledge.jade b/server/views/commit/pledge.jade
new file mode 100644
index 0000000000..84ce52ad49
--- /dev/null
+++ b/server/views/commit/pledge.jade
@@ -0,0 +1,15 @@
+extends ../layout
+block content
+    .panel.panel-info
+        .panel-body
+            h3.text-center You've commited!
+            .row
+                .col-xs-12.col-sm-6.col-sm-offset-3
+                  p Congratulations, you have commit to giving
+                    span(style='text-transform: capitalize')  #{nonprofit}
+                    |  #{amount} dollars a month until you have reached your goal
+                    |  of completing your #{goal}
+            .row
+                .col-xs-12.col-sm-6.col-sm-offset-3
+                  img.img-responsive(src='http://i.imgur.com/U1CyEuA.jpg' alt="Girl Develop It participants coding at tables.")
+                  p Girl Develop It is a nonprofit that provides in-person classes for women to learn to code.

From c8da944caf7ec60ad2926845043109ecf91aa6f1 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 12:27:53 -0700
Subject: [PATCH 016/140] Add logic to load nonprofit on query Add logic to
 model update

---
 common/models/pledge.json      | 31 ++++++------
 common/models/user.json        |  5 ++
 server/boot/commit.js          | 88 +++++++++++++++++++++++++++++-----
 server/utils/commit.json       | 10 ++++
 server/views/commit/index.jade | 45 ++++++++---------
 5 files changed, 129 insertions(+), 50 deletions(-)
 create mode 100644 server/utils/commit.json

diff --git a/common/models/pledge.json b/common/models/pledge.json
index b563d4629e..08e46df414 100644
--- a/common/models/pledge.json
+++ b/common/models/pledge.json
@@ -5,7 +5,8 @@
   "trackChanges": false,
   "properties": {
     "nonprofit": {
-      "type": "string"
+      "type": "string",
+      "index": true
     },
     "amount": {
       "type": "number"
@@ -16,13 +17,24 @@
     },
     "dateEnded": {
       "type": "date"
+    },
+    "formerUserId": {
+      "type": "string"
+    },
+    "isOrphaned": {
+      "type": "boolean"
+    },
+    "isCompleted": {
+      "type": "boolean",
+      "default": "false"
     }
   },
   "validations": [],
   "relations": {
-    "camper": {
+    "user": {
       "type": "hasMany",
-      "model": "user"
+      "model": "user",
+      "foreignKey": "userId"
     }
   },
   "acls": [
@@ -39,16 +51,5 @@
       "permission": "ALLOW"
     }
   ],
-  "methods": [],
-  "indexes": {
-    "nonprofit_amount":{
-      "keys": {
-        "nonprofit": 1,
-        "amount": 1
-      },
-      "options": {
-        "unique": true
-      }
-    }
-  }
+  "methods": []
 }
diff --git a/common/models/user.json b/common/models/user.json
index 776c2c500e..f85cc1023c 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -166,6 +166,11 @@
       "type": "hasMany",
       "model": "userIdentity",
       "foreignKey": ""
+    },
+    "pledge": {
+      "type": "hasOne",
+      "model": "pledge",
+      "foreignKey": ""
     }
   },
   "acls": [
diff --git a/server/boot/commit.js b/server/boot/commit.js
index 40203fca32..be08d85348 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -1,16 +1,33 @@
+import _ from 'lodash';
+import debugFactory from 'debug';
 import dedent from 'dedent';
+import nonprofits from '../utils/commit.json';
+
+import {
+  unDasherize
+} from '../utils';
+
+import {
+  observeQuery,
+  saveInstance
+} from '../utils/rx';
+
 import {
   ifNoUserRedirectTo
 } from '../utils/middleware';
 
 const sendNonUserToFront = ifNoUserRedirectTo('/');
+const debug = debugFactory('freecc:commit');
 
 export default function commit(app) {
   const router = app.loopback.Router();
+  const { Pledge } = app.models;
+
   router.get(
     '/commit',
     commitToNonprofit
   );
+
   router.get(
     '/commit/pledge',
     sendNonUserToFront,
@@ -20,27 +37,72 @@ export default function commit(app) {
   app.use(router);
 
   function commitToNonprofit(req, res) {
-    res.render('commit/', {
-      title: 'Commit to a nonprofit. Commit to your goal.'
-    });
+    let nonprofitName = unDasherize(req.query.nonprofit);
+    let nonprofit;
+
+    debug('looking for nonprofit', nonprofitName);
+    if (nonprofitName) {
+      nonprofit = _.find(nonprofits, (nonprofit) => {
+        return nonprofitName === nonprofit.name;
+      });
+    }
+
+    nonprofit = nonprofit || nonprofits[0];
+
+    res.render(
+      'commit/',
+      Object.assign(
+        { title: 'Commit to a nonprofit. Commit to your goal.' },
+        nonprofit
+      )
+    );
   }
 
-  function pledge(req, res) {
+  function pledge(req, res, next) {
     const { user } = req;
     const {
       nonprofit = 'girl develop it',
       amount = '5',
-      goal = 'front end certification'
+      goal = 'Front End Development Certification'
     } = req.query;
 
-    req.flash('success', {
-      msg: dedent`
-        Congratulations, you have commit to giving ${nonprofit} ${amount}
-        dollars a month until you have reached your goal
-        of completing your ${goal}
-      `
-    });
+    observeQuery(user, 'pledge')
+      .flatMap(oldPledge => {
+        // create new pledge for user
+        const pledge = Pledge({
+          nonprofit,
+          amount,
+          goal,
+          userId: user.id
+        });
+
+        if (oldPledge) {
+          debug('user already has pledge, creating a new one');
+          // we orphan last pledge since a user only has one pledge at a time
+          oldPledge.userId = '';
+          oldPledge.formerUser = user.id;
+          oldPledge.endDate = new Date();
+          oldPledge.isOrphaned = true;
+          return saveInstance(oldPledge)
+            .flatMap(() => {
+              return saveInstance(pledge);
+            });
+        }
+        return saveInstance(pledge);
+      })
+      .subscribe(
+        ({ nonprofit, goal, amount }) => {
+          req.flash('success', {
+            msg: dedent`
+              Congratulations, you have committed to giving
+              ${nonprofit} $${amount} each month until you have completed
+              your ${goal}.
+            `
+          });
+          res.redirect('/' + user.username);
+        },
+        next
+      );
 
-    res.redirect('/' + user.username);
   }
 }
diff --git a/server/utils/commit.json b/server/utils/commit.json
new file mode 100644
index 0000000000..41d16d36c8
--- /dev/null
+++ b/server/utils/commit.json
@@ -0,0 +1,10 @@
+[
+  {
+    "name": "girl develop it",
+    "displayName": "Girl Develop It",
+    "donateUrl": "https://www.girldevelopit.com/donate",
+    "description": "Girl Develop It provides in-person classes for women to learn to code.",
+    "imgAlt": "Girl Develop It participants coding at tables.",
+    "imgUrl": "http://i.imgur.com/U1CyEuA.jpg"
+  }
+]
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 7fd469ca1a..1402545af7 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -5,48 +5,49 @@ block content
             h3.text-center Commit to yourself. Commit to a nonprofit.
             .row
                 .col-xs-12.col-sm-6.col-sm-offset-3
-                    p Are you looking for a burst of motivation? Do you want to help nonprofits before you’re ready to code for them? You can do both by pledging a monthly donation to a nonprofit until you've earned either your Front End or Full Stack Development certificate. Join Commit below or click "maybe later".
+                  p Give yourself ongoing motivation and help nonprofits right away. Pledge a monthly donation to a nonprofit until you’ve earned either your Front End or Full Stack Development Certification.
             .row
                 .col-xs-12.col-sm-6.col-sm-offset-3.text-center
-                    h4 Our Featured Nonprofit
-                    a(href="http://i.imgur.com/U1CyEuA.jpg" data-lightbox="img-enlarge")
-                        img.img-responsive(src='http://i.imgur.com/U1CyEuA.jpg' alt="Girl Develop It participants coding at tables.")
-                        p Girl Develop It is a nonprofit that provides in-person classes for women to learn to code.
-                .spacer
+                  h4 Pledge to #{displayName}
+                  .spacer
+                      a(href='#{imgUrl}' data-lightbox='img-enlarge' alt='#{imgAlt}')
+                          img.img-responsive(src='#{imgUrl}' alt='#{imgAlt}')
+                      p= description
+                  a or browse our directory
+            .spacer
             form.form(name='commit')
                 .hidden
-                    input(type='text' value='girl develop it' name='nonprofit')
+                    input(type='text' value='#{name}' name='nonprofit')
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3
-                        h4 Step 1: Choose your goal
+                        h4 Choose your goal:
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
-                            label.btn.btn-info.active
-                                input(type='radio' id='front-end-development-certificate' value='front end certification' name='goal' checked="checked")
+                            label.btn.btn-primary.btn-lg.active
+                                input(type='radio' id='front-end-development-certificate' value='Front End Development Certification' name='goal' checked="checked")
                                 | Front End Development Certificate (takes about 400 hours)
-                            label.btn.btn-info
-                                input(type='radio' id='full-stack-development-certificate' value='full stack certification' name='goal')
+                            label.btn.btn-primary.btn-lg
+                                input(type='radio' id='full-stack-development-certificate' value='Full Stack Development Certification' name='goal')
                                 | Full Stack Development Certificate (takes about 800 hours)
-                    .spacer
+                .spacer
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3
-                        h4 Step 2: Choose how much you want to donate each month
+                        h4 Choose how much you want to pledge each month:
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
-                            label.btn.btn-primary
+                            label.btn.btn-success
                                 input(type='radio' id='5-dollar-pledge' value='5' name='amount')
                                 | $5 per month
-                            label.btn.btn-primary.active
+                            label.btn.btn-success.active
                                 input(type='radio' id='10-dollar-pledge' value='10' name='amount' checked="checked")
                                 | $10 per month
-                            label.btn.btn-primary
+                            label.btn.btn-success
                                 input(type='radio' id='50-dollar-pledge' value='50' name='amount')
                                 | $50 per month
-                    .spacer
+                .spacer
                 .row
-                    .col-xs-12.col-sm-6.col-sm-offset-3
-                        h4 Step 3: Commit
-                        a#commit-btn-submit.btn.btn-block.btn-primary(href='https://www.girldevelopit.com/donate' target='_blank') Commit
+                    .col-xs-12.col-sm-6.col-sm-offset-3.text-center
+                        a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href='https://www.girldevelopit.com/donate' target='_blank') Commit (and open donate page)
                         .button-spacer
-                        a.btn.btn-block.btn-warning(href='/') Maybe later
+                        a(href='/') Maybe later
                         .spacer
     script.
       $(function() {

From 362efd4365cff76c1ab228af49b4505259176b4f Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 14:54:59 -0700
Subject: [PATCH 017/140] Add display on user profile when user commits

---
 server/boot/commit.js          | 41 +++++++++++++++++++++-------------
 server/boot/user.js            |  9 ++++++--
 server/views/account/show.jade |  6 +++++
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/server/boot/commit.js b/server/boot/commit.js
index be08d85348..c04169f732 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -19,6 +19,18 @@ import {
 const sendNonUserToFront = ifNoUserRedirectTo('/');
 const debug = debugFactory('freecc:commit');
 
+function findNonprofit(name) {
+  let nonprofit;
+  if (name) {
+    nonprofit = _.find(nonprofits, (nonprofit) => {
+      return name === nonprofit.name;
+    });
+  }
+
+  nonprofit = nonprofit || nonprofits[0];
+  return nonprofit;
+}
+
 export default function commit(app) {
   const router = app.loopback.Router();
   const { Pledge } = app.models;
@@ -38,16 +50,9 @@ export default function commit(app) {
 
   function commitToNonprofit(req, res) {
     let nonprofitName = unDasherize(req.query.nonprofit);
-    let nonprofit;
+    const nonprofit = findNonprofit(nonprofitName);
 
     debug('looking for nonprofit', nonprofitName);
-    if (nonprofitName) {
-      nonprofit = _.find(nonprofits, (nonprofit) => {
-        return nonprofitName === nonprofit.name;
-      });
-    }
-
-    nonprofit = nonprofit || nonprofits[0];
 
     res.render(
       'commit/',
@@ -61,20 +66,26 @@ export default function commit(app) {
   function pledge(req, res, next) {
     const { user } = req;
     const {
-      nonprofit = 'girl develop it',
+      nonprofit: nonprofitName = 'girl develop it',
       amount = '5',
       goal = 'Front End Development Certification'
     } = req.query;
 
+    const nonprofit = findNonprofit(nonprofitName);
+
     observeQuery(user, 'pledge')
       .flatMap(oldPledge => {
         // create new pledge for user
-        const pledge = Pledge({
-          nonprofit,
-          amount,
-          goal,
-          userId: user.id
-        });
+        const pledge = Pledge(
+          Object.assign(
+            {
+              amount,
+              goal,
+              userId: user.id
+            },
+            nonprofit
+          )
+        );
 
         if (oldPledge) {
           debug('user already has pledge, creating a new one');
diff --git a/server/boot/user.js b/server/boot/user.js
index ae6453f5d8..f266fa6f12 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -164,7 +164,10 @@ module.exports = function(app) {
     const username = req.params.username.toLowerCase();
     const { path } = req;
     User.findOne(
-      { where: { username } },
+      {
+        where: { username },
+        include: 'pledge'
+      },
       function(err, profileUser) {
         if (err) {
           return next(err);
@@ -175,6 +178,7 @@ module.exports = function(app) {
           });
           return res.redirect('/');
         }
+        profileUser = profileUser.toJSON();
 
         var cals = profileUser
           .progressTimestamps
@@ -217,7 +221,6 @@ module.exports = function(app) {
           return (obj.name || '').match(/^Waypoint/i);
         });
 
-        debug('user is fec', profileUser.isFrontEndCert);
         res.render('account/show', {
           title: 'Camper ' + profileUser.username + '\'s portfolio',
           username: profileUser.username,
@@ -227,6 +230,8 @@ module.exports = function(app) {
           isGithubCool: profileUser.isGithubCool,
           isLocked: !!profileUser.isLocked,
 
+          pledge: profileUser.pledge,
+
           isFrontEndCert: profileUser.isFrontEndCert,
           isFullStackCert: profileUser.isFullStackCert,
           isHonest: profileUser.isHonest,
diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index e48c80eff9..ae7c9a3e0e 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -58,6 +58,12 @@ block content
                     h1.flat-top.wrappable= name
                     h1.flat-top.wrappable= location
                     h1.flat-top.text-primary= "[ " + (progressTimestamps.length) + " ]"
+                    if pledge
+                        .spacer
+                        h4 I am commited to giving $#{pledge.amount} to
+                          a(href='#{pledge.donate}')  #{pledge.displayName}
+                          |  each month until I have complete the #{pledge.goal}
+                        .spacer
                     if isFrontEndCert
                         a.btn.btn-primary(href='/' + username + '/front-end-certification') View My Front End Development Certification
                     if isFullStackCert

From d132978df95043f6bd9d8bda9182120188610327 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 17:52:57 -0700
Subject: [PATCH 018/140] Add ability to edit commit

---
 server/boot/commit.js          | 47 ++++++++++++++++++++++++++--------
 server/utils/commit.json       |  8 ++++++
 server/views/account/show.jade | 11 +++++---
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/server/boot/commit.js b/server/boot/commit.js
index c04169f732..7e4b7c21c0 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import { Observable } from 'rx';
 import debugFactory from 'debug';
 import dedent from 'dedent';
 import nonprofits from '../utils/commit.json';
@@ -48,19 +49,46 @@ export default function commit(app) {
 
   app.use(router);
 
-  function commitToNonprofit(req, res) {
+  function commitToNonprofit(req, res, next) {
+    const { user } = req;
     let nonprofitName = unDasherize(req.query.nonprofit);
-    const nonprofit = findNonprofit(nonprofitName);
 
     debug('looking for nonprofit', nonprofitName);
+    const nonprofit = findNonprofit(nonprofitName);
+
+    Observable.just(user)
+      .flatMap(user => {
+        if (user) {
+          debug('getting user pledge');
+          return observeQuery(user, 'pledge');
+        }
+        return Observable.just();
+      })
+      .subscribe(
+        pledge => {
+          if (pledge) {
+            debug('found previous pledge');
+            req.flash('info', {
+              msg: dedent`
+                Looks like you already have a pledge to ${pledge.displayName}.
+                Hitting commit here will replace your old commitment.
+              `
+            });
+          }
+          res.render(
+            'commit/',
+            Object.assign(
+              {
+                title: 'Commit to a nonprofit. Commit to your goal.',
+                pledge
+              },
+              nonprofit
+            )
+          );
+        },
+        next
+      );
 
-    res.render(
-      'commit/',
-      Object.assign(
-        { title: 'Commit to a nonprofit. Commit to your goal.' },
-        nonprofit
-      )
-    );
   }
 
   function pledge(req, res, next) {
@@ -114,6 +142,5 @@ export default function commit(app) {
         },
         next
       );
-
   }
 }
diff --git a/server/utils/commit.json b/server/utils/commit.json
index 41d16d36c8..c0e09277c4 100644
--- a/server/utils/commit.json
+++ b/server/utils/commit.json
@@ -6,5 +6,13 @@
     "description": "Girl Develop It provides in-person classes for women to learn to code.",
     "imgAlt": "Girl Develop It participants coding at tables.",
     "imgUrl": "http://i.imgur.com/U1CyEuA.jpg"
+  },
+  {
+    "name": "black girls code",
+    "displayName": "Black Girls CODE",
+    "donateUrl": "http://www.blackgirlscode.com/",
+    "description": "Black Girls CODE is devoted to showing the world that black girls can code, and do so much more.",
+    "imgAlt": "Girls developing code with instructor",
+    "imgUrl": "http://i.imgur.com/HBVrdaj.jpg"
   }
 ]
diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index ae7c9a3e0e..267d281b20 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -60,9 +60,10 @@ block content
                     h1.flat-top.text-primary= "[ " + (progressTimestamps.length) + " ]"
                     if pledge
                         .spacer
-                        h4 I am commited to giving $#{pledge.amount} to
-                          a(href='#{pledge.donate}')  #{pledge.displayName}
-                          |  each month until I have complete the #{pledge.goal}
+                          h4
+                            | This camper has committed to giving $#{pledge.amount} to
+                            a(href='#{pledge.donateUrl}?ref=freecodecamp.com' target='_blank')  #{pledge.displayName}
+                            |  each month until they have completed the #{pledge.goal}
                         .spacer
                     if isFrontEndCert
                         a.btn.btn-primary(href='/' + username + '/front-end-certification') View My Front End Development Certification
@@ -174,6 +175,10 @@ block content
                         a.btn.btn-lg.btn-block.btn-info.btn-link-social(href='/toggle-lockdown-mode')
                             span.ion-unlocked
                             | Let other people see all my solutions
+                .col-xs-12
+                    a.btn.btn-lg.btn-block.btn-success.btn-link-social(href='/commit')
+                        span.ion-android-exit
+                        | Edit my pledge
                 .col-xs-12
                     a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout')
                         span.ion-android-exit

From 0b716c0057ef8566e9f0f85ad9df55918ee38f3a Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 18:22:12 -0700
Subject: [PATCH 019/140] Add stop commit functionality

---
 server/boot/commit.js          | 38 ++++++++++++++++++++++++++++++++++
 server/views/commit/index.jade | 13 ++++++++++--
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/server/boot/commit.js b/server/boot/commit.js
index 7e4b7c21c0..ef2ce5d6ba 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -18,6 +18,10 @@ import {
 } from '../utils/middleware';
 
 const sendNonUserToFront = ifNoUserRedirectTo('/');
+const sendNonUserToCommit = ifNoUserRedirectTo(
+  '/commit',
+  'Must be signed in to update commit'
+);
 const debug = debugFactory('freecc:commit');
 
 function findNonprofit(name) {
@@ -47,6 +51,12 @@ export default function commit(app) {
     pledge
   );
 
+  router.post(
+    '/commit/stop-commitment',
+    sendNonUserToCommit,
+    stopCommit
+  );
+
   app.use(router);
 
   function commitToNonprofit(req, res, next) {
@@ -143,4 +153,32 @@ export default function commit(app) {
         next
       );
   }
+
+  function stopCommit(req, res, next) {
+    const { user } = req;
+
+    observeQuery(user, 'pledge')
+      .flatMap(pledge => {
+        if (!pledge) {
+          return Observable.just();
+        }
+
+        pledge.formerUserId = pledge.userId;
+        pledge.userId = null;
+        pledge.isOrphaned = true;
+        pledge.dateEnded = new Date();
+        return saveInstance(pledge);
+      })
+      .subscribe(
+        pledge => {
+          let msg = `You have successfully stopped your pledge.`;
+          if (!pledge) {
+            msg = `No pledge found for user ${user.username}.`;
+          }
+          req.flash('errors', { msg });
+          return res.redirect('/commit');
+        },
+        next
+      );
+  }
 }
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 1402545af7..014275a608 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -5,7 +5,7 @@ block content
             h3.text-center Commit to yourself. Commit to a nonprofit.
             .row
                 .col-xs-12.col-sm-6.col-sm-offset-3
-                  p Give yourself ongoing motivation and help nonprofits right away. Pledge a monthly donation to a nonprofit until you’ve earned either your Front End or Full Stack Development Certification.
+                  p Give yourself external motivation and help nonprofits right away. Pledge a monthly donation to a nonprofit until you’ve earned either your Front End or Full Stack Development Certification.
             .row
                 .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                   h4 Pledge to #{displayName}
@@ -47,8 +47,17 @@ block content
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href='https://www.girldevelopit.com/donate' target='_blank') Commit (and open donate page)
                         .button-spacer
+                .spacer
+            if pledge
+                form.row(name='stop-pledge' action='/commit/stop-commitment' method='post')
+                    .col-xs-12.col-sm-6.col-sm-offset-3.text-center
+                        button.btn.btn-sm.btn-danger(name='submit' type='submit') Stop my pledge
+                .spacer
+            else
+                .row
+                    .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         a(href='/') Maybe later
-                        .spacer
+                .spacer
     script.
       $(function() {
         $('#commit-btn-submit').click(function() {

From 49c06b266ef6fffb073b703989947a6b4fc7db12 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 19:49:38 -0700
Subject: [PATCH 020/140] Add complete commit endpoint

---
 server/boot/commit.js          | 46 +++++++++++++++++++++++++++++++++-
 server/utils/commit-goals.json |  4 +++
 server/views/commit/index.jade |  4 +--
 3 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 server/utils/commit-goals.json

diff --git a/server/boot/commit.js b/server/boot/commit.js
index ef2ce5d6ba..b15a02468b 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -2,7 +2,9 @@ import _ from 'lodash';
 import { Observable } from 'rx';
 import debugFactory from 'debug';
 import dedent from 'dedent';
+
 import nonprofits from '../utils/commit.json';
+import commitGoals from '../utils/commit-goals.json';
 
 import {
   unDasherize
@@ -57,6 +59,12 @@ export default function commit(app) {
     stopCommit
   );
 
+  router.post(
+    '/commit/complete-goal',
+    sendNonUserToCommit,
+    completeCommitment
+  );
+
   app.use(router);
 
   function commitToNonprofit(req, res, next) {
@@ -90,7 +98,9 @@ export default function commit(app) {
             Object.assign(
               {
                 title: 'Commit to a nonprofit. Commit to your goal.',
-                pledge
+                pledge,
+                frontEndCert: commitGoals.frontEndCert,
+                fullStackCert: commitGoals.fullStackCert
               },
               nonprofit
             )
@@ -154,6 +164,40 @@ export default function commit(app) {
       );
   }
 
+  function completeCommitment(req, res, next) {
+    const { user } = req;
+    const { isFrontEndCert, isFullStackCert } = user;
+
+    observeQuery(user, 'pledge')
+      .flatMap(pledge => {
+        const { goal } = pledge;
+        if (!pledge) {
+          return Observable.just('No pledge found');
+        }
+        if (
+          isFrontEndCert && goal === commitGoals.frontEndCert ||
+          isFullStackCert && goal === commitGoals.fullStackCert
+        ) {
+          pledge.isCompleted = true;
+          pledge.dateEnded = new Date();
+          return saveInstance(pledge);
+        }
+        return Observable.just(dedent`
+          You have not yet reached your goal of completing the ${goal}
+          Please retry when you have met the requirements.
+        `);
+      })
+      .subscribe(
+        msgOrPledge => {
+          if (typeof msgOrPledge === 'string') {
+            return res.send(msgOrPledge);
+          }
+          return res.send(true);
+        },
+        next
+      );
+  }
+
   function stopCommit(req, res, next) {
     const { user } = req;
 
diff --git a/server/utils/commit-goals.json b/server/utils/commit-goals.json
new file mode 100644
index 0000000000..8391145e6b
--- /dev/null
+++ b/server/utils/commit-goals.json
@@ -0,0 +1,4 @@
+{
+  "frontEndCert": "front-end-development-certificate",
+  "fullStackCert": "full-stack-development-certificate"
+}
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 014275a608..591c285919 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -23,10 +23,10 @@ block content
                         h4 Choose your goal:
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
                             label.btn.btn-primary.btn-lg.active
-                                input(type='radio' id='front-end-development-certificate' value='Front End Development Certification' name='goal' checked="checked")
+                                input(type='radio' id=frontEndCert value='Front End Development Certification' name='goal' checked="checked")
                                 | Front End Development Certificate (takes about 400 hours)
                             label.btn.btn-primary.btn-lg
-                                input(type='radio' id='full-stack-development-certificate' value='Full Stack Development Certification' name='goal')
+                                input(type='radio' id=fullStackCert value='Full Stack Development Certification' name='goal')
                                 | Full Stack Development Certificate (takes about 800 hours)
                 .spacer
                 .row

From 2864f607cc3241e2e347033a926f98f5922333dc Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 21:08:24 -0700
Subject: [PATCH 021/140] Add on certification, complete goal and stop pledge

---
 server/boot/certificate.js     | 19 +++++++++++++++++-
 server/boot/commit.js          | 28 ++++++--------------------
 server/utils/commit.js         | 36 ++++++++++++++++++++++++++++++++++
 server/views/commit/index.jade |  4 ++--
 4 files changed, 62 insertions(+), 25 deletions(-)
 create mode 100644 server/utils/commit.js

diff --git a/server/boot/certificate.js b/server/boot/certificate.js
index b084d9f4b8..400d756bcc 100644
--- a/server/boot/certificate.js
+++ b/server/boot/certificate.js
@@ -18,6 +18,10 @@ import {
   fullStackChallangeId
 } from '../utils/constantStrings.json';
 
+import {
+  completeCommitment$
+} from '../utils/commit';
+
 const debug = debugFactory('freecc:certification');
 const sendMessageToNonUser = ifNoUserSend(
   'must be logged in to complete.'
@@ -114,7 +118,20 @@ export default function certificate(app) {
             completedDate: new Date(),
             challengeType
           });
-          return saveUser(user);
+          return saveUser(user)
+            // If user has commited to nonprofit,
+            // this will complete his pledge
+            .flatMap(
+              user => completeCommitment$(user),
+              (user, pledgeOrMessage) => {
+                if (typeof pledgeOrMessage === 'string') {
+                  debug(pledgeOrMessage);
+                }
+                // we are only interested in the user object
+                // so we ignore return from completeCommitment$
+                return user;
+              }
+            );
         }
         return Observable.just(user);
       })
diff --git a/server/boot/commit.js b/server/boot/commit.js
index b15a02468b..4b04950c63 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -4,7 +4,10 @@ import debugFactory from 'debug';
 import dedent from 'dedent';
 
 import nonprofits from '../utils/commit.json';
-import commitGoals from '../utils/commit-goals.json';
+import {
+  commitGoals,
+  completeCommitment$
+} from '../utils/commit';
 
 import {
   unDasherize
@@ -116,7 +119,7 @@ export default function commit(app) {
     const {
       nonprofit: nonprofitName = 'girl develop it',
       amount = '5',
-      goal = 'Front End Development Certification'
+      goal = commitGoals.frontEndCert
     } = req.query;
 
     const nonprofit = findNonprofit(nonprofitName);
@@ -166,27 +169,8 @@ export default function commit(app) {
 
   function completeCommitment(req, res, next) {
     const { user } = req;
-    const { isFrontEndCert, isFullStackCert } = user;
 
-    observeQuery(user, 'pledge')
-      .flatMap(pledge => {
-        const { goal } = pledge;
-        if (!pledge) {
-          return Observable.just('No pledge found');
-        }
-        if (
-          isFrontEndCert && goal === commitGoals.frontEndCert ||
-          isFullStackCert && goal === commitGoals.fullStackCert
-        ) {
-          pledge.isCompleted = true;
-          pledge.dateEnded = new Date();
-          return saveInstance(pledge);
-        }
-        return Observable.just(dedent`
-          You have not yet reached your goal of completing the ${goal}
-          Please retry when you have met the requirements.
-        `);
-      })
+    return completeCommitment$(user)
       .subscribe(
         msgOrPledge => {
           if (typeof msgOrPledge === 'string') {
diff --git a/server/utils/commit.js b/server/utils/commit.js
new file mode 100644
index 0000000000..6eb48d139b
--- /dev/null
+++ b/server/utils/commit.js
@@ -0,0 +1,36 @@
+import dedent from 'dedent';
+import debugFactory from 'debug';
+import { Observable } from 'rx';
+
+import commitGoals from './commit-goals.json';
+const debug = debugFactory('freecc:utils/commit');
+
+export { commitGoals };
+
+export function completeCommitment$(user) {
+  const { isFrontEndCert, isFullStackCert } = user;
+  return Observable.fromNodeCallback(user.pledge, user)()
+    .flatMap(pledge => {
+      if (!pledge) {
+        return Observable.just('No pledge found');
+      }
+
+      const { goal } = pledge;
+
+      if (
+        isFrontEndCert && goal === commitGoals.frontEndCert ||
+        isFullStackCert && goal === commitGoals.fullStackCert
+      ) {
+        debug('marking goal complete');
+        pledge.isCompleted = true;
+        pledge.dateEnded = new Date();
+        pledge.formerUserId = pledge.userId;
+        pledge.userId = null;
+        return Observable.fromNodeCallback(pledge.save, pledge)();
+      }
+      return Observable.just(dedent`
+        You have not yet reached your goal of completing the ${goal}
+        Please retry when you have met the requirements.
+      `);
+    });
+}
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 591c285919..52528046f0 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -23,10 +23,10 @@ block content
                         h4 Choose your goal:
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
                             label.btn.btn-primary.btn-lg.active
-                                input(type='radio' id=frontEndCert value='Front End Development Certification' name='goal' checked="checked")
+                                input(type='radio' id=frontEndCert value=frontEndCert name='goal' checked="checked")
                                 | Front End Development Certificate (takes about 400 hours)
                             label.btn.btn-primary.btn-lg
-                                input(type='radio' id=fullStackCert value='Full Stack Development Certification' name='goal')
+                                input(type='radio' id=fullStackCert value=fullStackCert name='goal')
                                 | Full Stack Development Certificate (takes about 800 hours)
                 .spacer
                 .row

From 44fd85dff855ebf46b57b47c30146398ba39213d Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 22:37:08 -0700
Subject: [PATCH 022/140] Add ability to filter beta challenges from production

This PR adds the ability to test out challenges in beta
without fear that they will leak to production servers.

In development all challenges will display.

In production all challenges marked 'isBeta' will be filtered out
except in the case the environmental variable `BETA` is set ture,
in which case all challenges will display.
---
 seed/index.js            | 2 ++
 server/boot/challenge.js | 7 +++++++
 server/server.js         | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/seed/index.js b/seed/index.js
index 334a11d3dc..bd05f2de96 100644
--- a/seed/index.js
+++ b/seed/index.js
@@ -43,6 +43,7 @@ Challenge.destroyAll(function(err, info) {
     var challengeSpec = require('./challenges/' + file);
     var order = challengeSpec.order;
     var block = challengeSpec.name;
+    var isBeta = !!challengeSpec.isBeta;
 
     // challenge file has no challenges...
     if (challengeSpec.challenges.length === 0) {
@@ -66,6 +67,7 @@ Challenge.destroyAll(function(err, info) {
         challenge.order = order;
         challenge.suborder = index + 1;
         challenge.block = block;
+        challenge.isBeta = challenge.isBeta || isBeta;
 
         return challenge;
       });
diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 745f8be876..c8da8de013 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -16,6 +16,8 @@ import {
   ifNoUserSend
 } from '../utils/middleware';
 
+const isDev = process.env.NODE_ENV !== 'production';
+const isBeta = !!process.env.BETA;
 const debug = debugFactory('freecc:challenges');
 const challengesRegex = /^(bonfire|waypoint|zipline|basejump)/i;
 const firstChallenge = 'waypoint-say-hello-to-html-elements';
@@ -105,6 +107,9 @@ module.exports = function(app) {
       null,
       Scheduler.default
     ))
+    // filter out all challenges that have isBeta flag set
+    // except in development or beta site
+    .filter(challenge => isDev || isBeta || !challenge.isBeta)
     .shareReplay();
 
   // create a stream of challenge blocks
@@ -543,8 +548,10 @@ module.exports = function(app) {
           }
           return sum;
         }, 0);
+        const isBeta = _.every(blockArray, 'isBeta');
 
         return {
+          isBeta,
           name: blockArray[0].block,
           dashedName: dasherize(blockArray[0].block),
           challenges: blockArray,
diff --git a/server/server.js b/server/server.js
index 16fe784113..2e6073da0f 100755
--- a/server/server.js
+++ b/server/server.js
@@ -16,6 +16,7 @@ var getUsernameFromProvider = require('./utils/auth').getUsernameFromProvider;
 var generateKey =
   require('loopback-component-passport/lib/models/utils').generateKey;
 
+var isBeta = !!process.env.BETA;
 var app = loopback();
 
 expressState.extend(app);
@@ -96,10 +97,13 @@ app.start = function() {
   app.listen(app.get('port'), function() {
     app.emit('started');
     console.log(
-      'FreeCodeCamp server listening on port %d in %s mode',
+      'FreeCodeCamp server listening on port %d in %s',
       app.get('port'),
       app.get('env')
     );
+    if (isBeta) {
+      console.log('Free Code Camp is in beta mode');
+    }
   });
 };
 

From 364f79818f1d1a27826c5459b06a1799de034ab8 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 23:26:15 -0700
Subject: [PATCH 023/140] Fix dynamic commit link

---
 server/views/commit/index.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 52528046f0..f050211e35 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -45,7 +45,7 @@ block content
                 .spacer
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
-                        a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href='https://www.girldevelopit.com/donate' target='_blank') Commit (and open donate page)
+                        a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit (and open donate page)
                         .button-spacer
                 .spacer
             if pledge

From 3273593b9c0e956704bad1bc90d5988c44a7f515 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 23:32:31 -0700
Subject: [PATCH 024/140] Change order of edit buttons on profile

---
 server/views/account/show.jade | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index 267d281b20..9b11ef7778 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -161,6 +161,10 @@ block content
         .panel.panel-info
             .panel-heading.text-center Manage Your Account
             .panel-body
+                .col-xs-12
+                    a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout')
+                        span.ion-android-exit
+                        | Sign me out of Free Code Camp
                 .col-xs-12
                     a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='mailto:team@freecodecamp.com')
                         span.ion-email
@@ -177,12 +181,8 @@ block content
                             | Let other people see all my solutions
                 .col-xs-12
                     a.btn.btn-lg.btn-block.btn-success.btn-link-social(href='/commit')
-                        span.ion-android-exit
+                        span.ion-edit
                         | Edit my pledge
-                .col-xs-12
-                    a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout')
-                        span.ion-android-exit
-                        | Sign me out of Free Code Camp
                 .col-xs-12
                     a.btn.btn-lg.btn-block.btn-danger.btn-link-social.confirm-deletion
                         span.ion-trash-b

From f5966c0959bc88c3e8e03e86f99b9915b85f5354 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 23:33:17 -0700
Subject: [PATCH 025/140] Change redirect and text on commit

---
 server/boot/commit.js          | 2 +-
 server/views/commit/index.jade | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/boot/commit.js b/server/boot/commit.js
index 4b04950c63..b34d9716a0 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -204,7 +204,7 @@ export default function commit(app) {
             msg = `No pledge found for user ${user.username}.`;
           }
           req.flash('errors', { msg });
-          return res.redirect('/commit');
+          return res.redirect(`/${user.username}`);
         },
         next
       );
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index f050211e35..179afd92cd 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -47,15 +47,13 @@ block content
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit (and open donate page)
                         .button-spacer
-                .spacer
             if pledge
                 form.row(name='stop-pledge' action='/commit/stop-commitment' method='post')
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         button.btn.btn-sm.btn-danger(name='submit' type='submit') Stop my pledge
-                .spacer
             else
                 .row
-                    .col-xs-12.col-sm-6.col-sm-offset-3.text-center
+                    h4.col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         a(href='/') Maybe later
                 .spacer
     script.

From a7b2dc71b123a7a751f6b1813f8e2c33c74ecf26 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Tue, 6 Oct 2015 23:47:40 -0700
Subject: [PATCH 026/140] Fix BF Exact Change Tests

Added a test case for when the smallest denomination of change available is larger than the total change required.

Closes #1409
---
 seed/challenges/advanced-bonfires.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index db81a04400..a4488b8696 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -142,6 +142,7 @@
         "assert.deepEqual(drawer(19.50, 20.00, [[\"PENNY\", 1.01], [\"NICKEL\", 2.05], [\"DIME\", 3.10], [\"QUARTER\", 4.25], [\"ONE\", 90.00], [\"FIVE\", 55.00], [\"TEN\", 20.00], [\"TWENTY\", 60.00], [\"ONE HUNDRED\", 100.00]]), [[\"QUARTER\", 0.50]], 'message: <code>drawer(19.50, 20.00, [[\"PENNY\", 1.01], [\"NICKEL\", 2.05], [\"DIME\", 3.10], [\"QUARTER\", 4.25], [\"ONE\", 90.00], [\"FIVE\", 55.00], [\"TEN\", 20.00], [\"TWENTY\", 60.00], [\"ONE HUNDRED\", 100.00]])</code> should return <code>[[\"QUARTER\", 0.50]]</code>.');",
         "assert.deepEqual(drawer(3.26, 100.00, [[\"PENNY\", 1.01], [\"NICKEL\", 2.05], [\"DIME\", 3.10], [\"QUARTER\", 4.25], [\"ONE\", 90.00], [\"FIVE\", 55.00], [\"TEN\", 20.00], [\"TWENTY\", 60.00], [\"ONE HUNDRED\", 100.00]]), [[\"TWENTY\", 60.00], [\"TEN\", 20.00], [\"FIVE\", 15], [\"ONE\", 1], [\"QUARTER\", 0.50], [\"DIME\", 0.20], [\"PENNY\", 0.04]], 'message: <code>drawer(3.26, 100.00, [[\"PENNY\", 1.01], [\"NICKEL\", 2.05], [\"DIME\", 3.10], [\"QUARTER\", 4.25], [\"ONE\", 90.00], [\"FIVE\", 55.00], [\"TEN\", 20.00], [\"TWENTY\", 60.00], [\"ONE HUNDRED\", 100.00]])</code> should return <code>[[\"TWENTY\", 60.00], [\"TEN\", 20.00], [\"FIVE\", 15], [\"ONE\", 1], [\"QUARTER\", 0.50], [\"DIME\", 0.20], [\"PENNY\", 0.04]]</code>.');",
         "assert.deepEqual(drawer(19.50, 20.00, [[\"PENNY\", 0.01], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 0], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]), \"Insufficient Funds\", 'message: <code>drawer(19.50, 20.00, [[\"PENNY\", 0.01], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 0], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]])</code> should return \"Insufficient Funds\".');",
+        "assert.deepEqual(drawer(19.50, 20.00, [[\"PENNY\", 0.01], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 1.00], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]), \"Insufficient Funds\", 'message: <code>drawer(19.50, 20.00, [[\"PENNY\", 0.01], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 1.00], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]])</code> should return \"Insufficient Funds\".');",
         "assert.deepEqual(drawer(19.50, 20.00, [[\"PENNY\", 0.50], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 0], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]]), \"Closed\", 'message: <code>drawer(19.50, 20.00, [[\"PENNY\", 0.50], [\"NICKEL\", 0], [\"DIME\", 0], [\"QUARTER\", 0], [\"ONE\", 0], [\"FIVE\", 0], [\"TEN\", 0], [\"TWENTY\", 0], [\"ONE HUNDRED\", 0]])</code> should return \"Closed\".');"
       ],
       "MDNlinks": [

From 92b9f7153251c21808b7e7a7864ecb4a1bba8e45 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 00:05:26 -0700
Subject: [PATCH 027/140] Add commit directory page

---
 server/boot/commit.js              | 12 ++++++++++++
 server/views/commit/directory.jade | 21 +++++++++++++++++++++
 server/views/commit/index.jade     |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 server/views/commit/directory.jade

diff --git a/server/boot/commit.js b/server/boot/commit.js
index b34d9716a0..9a48ea5236 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -56,6 +56,11 @@ export default function commit(app) {
     pledge
   );
 
+  router.get(
+    '/commit/directory',
+    renderDirectory
+  );
+
   router.post(
     '/commit/stop-commitment',
     sendNonUserToCommit,
@@ -167,6 +172,13 @@ export default function commit(app) {
       );
   }
 
+  function renderDirectory(req, res) {
+    res.render('commit/directory', {
+      title: 'Commit Directory',
+      nonprofits
+    });
+  }
+
   function completeCommitment(req, res, next) {
     const { user } = req;
 
diff --git a/server/views/commit/directory.jade b/server/views/commit/directory.jade
new file mode 100644
index 0000000000..5ae6aadf4d
--- /dev/null
+++ b/server/views/commit/directory.jade
@@ -0,0 +1,21 @@
+extends ../layout
+block content
+    .panel.panel-info
+        .panel-heading.text-center Commit to one of these nonprofits
+        .panel-body
+            .row
+                .col-xs-12.col-sm-6.col-sm-offset-3
+                    for nonprofit in nonprofits
+                        .spacer
+                        .row
+                            .text-center
+                                h2= nonprofit.displayName
+                        .row
+                            .col-xs-12.col-sm-8.col-sm-offset-2
+                                img.img-responsive.img-center(src=nonprofit.imgUrl)
+                                p= nonprofit.description
+                        .row
+                            .col-xs-12.col-sm-8.col-sm-offset-2
+                                a.text-center.btn.btn-primary.btn-lg.btn-block(href='/commit?nonprofit=#{nonprofit.name}') Go to #{nonprofit.displayName}
+                        .spacer
+
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 179afd92cd..8d7a065f33 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -13,7 +13,7 @@ block content
                       a(href='#{imgUrl}' data-lightbox='img-enlarge' alt='#{imgAlt}')
                           img.img-responsive(src='#{imgUrl}' alt='#{imgAlt}')
                       p= description
-                  a or browse our directory
+                  a(href='/commit/directory') or browse our directory
             .spacer
             form.form(name='commit')
                 .hidden

From 987c29e26f1969407f194347c9f5d58377565a64 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 10 Sep 2015 16:42:41 -0700
Subject: [PATCH 028/140] add testimonials

---
 seed/testimonials.json | 450 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 450 insertions(+)
 create mode 100644 seed/testimonials.json

diff --git a/seed/testimonials.json b/seed/testimonials.json
new file mode 100644
index 0000000000..40f24a2488
--- /dev/null
+++ b/seed/testimonials.json
@@ -0,0 +1,450 @@
+[
+  {
+    "camper": "Bruna Torman Reseres Franasa",
+    "quote": "I’m now receiving offers for internships. I have no experience in IT, but now good things are happening!",
+    "github": "brunatrf",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABVPh9IB730qyshrsqO1hDNNRUL-X_4i8n0&authType=NAME_SEARCH&authToken=YYn-&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A357533650%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907147451%2Ctas%3Abruna",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/8/005/09e/16e/32c3d3f.jpg"
+  },
+  {
+    "camper": "Brian Emory",
+    "quote": "I like to learn by doing but with the books, while very informative, there was more reading than doing. I came across Free Code Camp which has allowed me to learn by doing. Whereas before I was struggling to learn, I am now not only learning but learning while building cool projects.",
+    "github": "thebrianemory",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABc3jXwB-iZdZKZIVAvL93RHGB7_J9gDbVA&authType=NAME_SEARCH&authToken=w1Km&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A389516668%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907166795%2Ctas%3Abrian%20emory",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAJOAAAAJDgyZWFhYWFjLTNhZGYtNGQzOC04M2JjLWE1Nzk1NmRiMDY4MA.jpg"
+  },
+  {
+    "camper": "Ryan Lindeman",
+    "quote": "Free Code Camp has been great in giving me a direct path to the full stack development skills I wanted to become more involved in projects at work.",
+    "github": "fai1whale",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAkMT1EBFCY849rMWYSDIEj6kosBJSH9n2s&authType=NAME_SEARCH&authToken=acmj&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A151801681%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907181695%2Ctas%3Aryan%20lind",
+    "image": "https://media.licdn.com/media/p/4/000/145/24d/18e8af8.jpg"
+  },
+  {
+    "camper": "Lori Becker",
+    "quote": "After graduating with a Masters degree in computer science, I could not share any of my code with employers (university policy: fear of aiding cheating). With FreeCodeCamp, I was able to develop a small portfolio.",
+    "github": "LCBecker",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADrtuwBOA_0ihkKIbUFXoXskXikQT9uVeo&authType=NAME_SEARCH&authToken=sctO&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A15447788%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907195702%2Ctas%3Alori",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/1/005/080/392/295a574.jpg"
+  },
+  {
+    "camper": "Brian Barrow",
+    "quote": "Free Code Camp has given me confidence that I can become a web developer.",
+    "github": "briancbarrow",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAVH-osBCI8WZTtv3Om5WjeD2rYnjQ6z7zA&authType=NAME_SEARCH&authToken=-yWK&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A88603275%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907213309%2Ctas%3Abrian%20barr",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/005/07e/272/050fd0e.jpg"
+  },
+  {
+    "camper": "Ralph Cachero",
+    "quote": "I am a software QA engineer. Free Code Camp has helped me understand what the developers go through.",
+    "github": "rcachero",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAJEF88BiUtMoxS3Ww7ooI9QmTZdrgP272Q&authType=NAME_SEARCH&authToken=2tza&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A38016975%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907225816%2Ctas%3Aralph",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/1/000/09f/2eb/0ec94ae.jpg"
+  },
+  {
+    "camper": "Ina Tsetsova",
+    "quote": "Bonfires really make me think and combine programming concepts creatively.",
+    "github": "Tsetsova",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAjPoIcBJsAF91dqwgxFQ4qct88yFcljXNU&authType=NAME_SEARCH&authToken=l8zY&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A147824775%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907239742%2Ctas%3Aina%20",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/4/005/0ad/379/050ce9d.jpg"
+  },
+  {
+    "camper": "Adam Goswick",
+    "quote": "Free Code Camp is helping me learn web development when I can’t afford to go back to school.",
+    "github": "thegoz85",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAObbhkBzeCKrzuEB0ssE_iGrBX0Xnu9URc&authType=NAME_SEARCH&authToken=xKaK&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A60517913%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907256670%2Ctas%3Aadam%20g",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/1/005/08d/084/0eeb904.jpg"
+  },
+  {
+    "camper": "Josh Cronkhite",
+    "quote": "My resume has been bolstered by adding a completely new stack, providing value to my clients and opening up the pool of potential clients that I would have otherwise referred to peers.",
+    "github": "joshcronkhite",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAGTPvoBg__9rivrYrYgo8sDJ561JpAfhHk&authType=NAME_SEARCH&authToken=6X77&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A26427130%2CauthType%3ANAME_SEARCH%2Cidx%3A1-3-3%2CtarId%3A1441907269831%2Ctas%3Ajosh",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/7/000/276/003/191e9f3.jpg"
+  },
+  {
+    "camper": "Ryan Jones",
+    "quote": "Learning to code with Free Code Camp has given me a leg up in my career. It has helped to train my brain to think with the logic that computers use. This is a tremendous aid in the field of digital forensics.",
+    "github": "ryanmjones",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABPJt1MBxC4Yero3PJPhF9rrr_Y7WfOGcCU&authType=NAME_SEARCH&authToken=Dre1&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A331986771%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907281816%2Ctas%3Aryan%20jones",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAbSAAAAJDUwY2RiZTUxLTg1YTktNDQ2Yy05YTZlLTU2NmY2YThlMmY0Yw.jpg"
+  },
+  {
+    "camper": "Kristin Anthony",
+    "quote": "The layout, pacing, and resources of Free Code Camp have given me focus and shown me a path to mastery. Just being able to tell people in my field that I’m learning full stack JavaScript and having projects to show for it has been immensely helpful both with my current position and in my job search.",
+    "github": "anthkris",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAZRM5MBACvQe36s4cvpe5ZHWEfgxprDUFg&authType=NAME_SEARCH&authToken=pozh&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A105984915%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907298390%2Ctas%3Akristin%20",
+    "image": "https://media.licdn.com/media/p/4/005/0b3/377/381a362.jpg"
+  },
+  {
+    "camper": "Qing Huang",
+    "quote": "Free Code Camp gives me more confidence at work. Code doesn’t look as foreign anymore.",
+    "github": "qingillustrates",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAOjjjoBDaPY1dtpvngnr8ednNTran6KA3s&authType=NAME_SEARCH&authToken=4zvM&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A61050426%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907310565%2Ctas%3Aqing",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAKsAAAAJDVlNmNkMzUwLWFjNzAtNDQ4OS05NWI5LWYyYmYzOWQzZjRlOQ.jpg"
+  },
+  {
+    "camper": "Jimmy Epperson",
+    "quote": "I learned to build websites, which is now a new service I offer to local businesses.",
+    "github": "jimmyepp",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADg3N8BTBm_D58gu8Tgq6UPa3OQ_19CrSE&authType=NAME_SEARCH&authToken=W7Eg&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A14736607%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907323386%2Ctas%3Ajimmy%20epper",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAALWAAAAJDUwZDc5YzYwLTc2MjYtNDIzYy1iYzAyLWNlNzZmMTNjM2M1NA.jpg"
+  },
+  {
+    "camper": "Sara Powell",
+    "quote": "I’ve progressed from not coding very much at all, to coding well enough to land job interviews for front end development positions.",
+    "github": "newtcobell",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAy1jmQBRjoGSUWd6Zib7FtekpSMBVHr7Vw&authType=NAME_SEARCH&authToken=wpT6&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A213225060%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907337130%2Ctas%3Asara%20powell",
+    "image": "https://media.licdn.com/media/p/8/000/1be/159/281c5b8.jpg"
+  },
+  {
+    "camper": "John Bull",
+    "quote": "I am now able to add customized branding and layouts to web applications that fellow employees and customers use everyday. I’m now looking to move away from desktop support and into development roles.",
+    "github": "Jbull328",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABAyfz8BsjE-oGv1k3URGzhRyeupnTGuK3I&authType=NAME_SEARCH&authToken=bnIc&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A271744831%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907350044%2Ctas%3Ajohn%20bull",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAL8AAAAJDliMGU0MTk0LWQ3YTUtNDY0NS1hMTg1LTdhN2Q1NTBlMzA5MQ.jpg"
+  },
+  {
+    "camper": "Nicholas Slaven",
+    "quote": "Free Code Camp has given me the courage to open the door to the idea of programming for a career.",
+    "github": "nslaven22",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA5HGyIBmpNcXY_tfHBkWxXI6OtwsFAeHRQ&authType=NAME_SEARCH&authToken=IIqr&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A239541026%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907370759%2Ctas%3Aslaven",
+    "image": "https://media.licdn.com/media/p/3/000/222/0d1/2606078.jpg"
+  },
+  {
+    "camper": "Andrea Goulet",
+    "quote": "Before enrolling in Free Code Camp, I was nervous when people asked me, \"Do you code?\", Now, I answer with a confident \"YES!\"",
+    "github": "andreagoulet",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAA4KWYB-mCMwEU3LvDHXt6H0rVHbBvszq0&authType=NAME_SEARCH&authToken=hUBG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A3680614%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907386771%2Ctas%3Aandrea%20go",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAMyAAAAJDI1MWU4OWU4LTZmNTAtNGFmMS1iYzcxLTA5Y2IwYzIyMWIxYQ.jpg"
+  },
+  {
+    "camper": "Justin Clay Lane",
+    "quote": "Free Code Camp provided a structured learning experience more akin to an actual class, compared to other free learning sites. I was recently hired to update and maintain the website for a local doctor’s office. The extra money and experience from that is wonderful.",
+    "github": "jclane",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAYZYQ4BBY337OqRUhMnZqDJNX1wNXjT7Bk&authType=NAME_SEARCH&authToken=8TbF&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A102326542%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907405129%2Ctas%3Ajustin%20lane",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAI5AAAAJDNmNzViYzdmLTdkMTEtNDllYS1iNTRmLWVmZjgzZTY3ZWNjNQ.jpg"
+  },
+  {
+    "camper": "Angshuman Gupta",
+    "quote": "I’m a co-founder of a startup. We had been coding with PHP, but always wanted to shift to meteor.js. Free Code Camp gave me a structured JavaScript guide.",
+    "github": "codingang",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAhIipMB6vAXaratEs0MtUd3GgyYm70cvbE&authType=NAME_SEARCH&authToken=pbTj&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A138971795%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907423626%2Ctas%3Aangsh",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAAKPAAAAJGRjMmQwZjY5LTViMmUtNDQyZS04Y2Y3LTRhYjZiYWJlZDQzNw.jpg"
+  },
+  {
+    "camper": "Rhonadale Florentino",
+    "quote": "I can now confidently tell clients that I can design their website.",
+    "github": "None Given",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAI53oUBmy6MPKp1UeHxBy3_y0cyTS4bWow&authType=NAME_SEARCH&authToken=gz62&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A37346949%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907434768%2Ctas%3Arhona",
+    "image": "https://media.licdn.com/media/p/7/005/0aa/319/1aaa08f.jpg"
+  },
+  {
+    "camper": "Jimson Sulit",
+    "quote": "Aside from the fact that I’m learning full stack web development, Free Code Camp has also given me the opportunity to lead local community projects.",
+    "github": "webdevjedi25",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAWqUccBopX2Wo_P1gYgy0iIEqChwXPTh2k&authType=NAME_SEARCH&authToken=kd5y&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A95048135%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907446780%2Ctas%3Ajimson",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAPzAAAAJDYyOGMxYmEyLTY1NTQtNDE3NS1iMmVkLWUwM2M4NjJiZWFhZg.jpg"
+  },
+  {
+    "camper": "Nick Galluzzo",
+    "quote": "I currently work in a support role for a tech startup (www.knackhq.com). The more I learn about JavaScript, the more I’m able to contribute to a product I really believe in!",
+    "github": "ngalluzzo",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAjQl1EBZPrbUQ6zGPXmKIuNzpCyqqsnox4&authType=NAME_SEARCH&authToken=9w-G&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A147887953%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907461071%2Ctas%3Anick%20gall",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAANtAAAAJDE3YWZmYjE0LTg4ODYtNDg1Mi1hZDhjLThkZmZhMjkxYWI3Mg.jpg"
+  },
+  {
+    "camper": "Stephanie Brown",
+    "quote": "Free Code Camp has given me structure and a direction while learning to code.",
+    "github": "strawmitch",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAARqP5cBDDdBxPUzluctvjUhOP3UsiowRtM&authType=NAME_SEARCH&authToken=TDfV&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A74071959%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907473116%2Ctas%3Astephanie%20brown",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAALJAAAAJGI5ZWY1MmNjLTJhMTUtNGI2NS04YTExLTFiOGZlYTRiMTNiOA.jpg"
+  },
+  {
+    "camper": "Genavieve Clausen",
+    "quote": "Free Code Camp has benefitted me in numerous ways, including the opportunity to learn in a self-paced, supportive environment. I am excited to be a part of a growing community making lasting connections for the career and lifestyle I am pursuing.",
+    "github": "GenavieveMarie",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAOISlMBAi43m1SG-xM_S2B8Vy05yiQz5rE&authType=NAME_SEARCH&authToken=AY6E&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A59263571%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907488270%2Ctas%3Agenav",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAWUAAAAJDc2ODU4MjVkLTlmMDUtNDM4My05OTY2LTliMTQxNzFlZmY0OQ.jpg"
+  },
+  {
+    "camper": "Tim Stauffer",
+    "quote": "I found Free Code Camp more helpful than my MS degree, so I quit college. Learning so much. Also saving $50,000.",
+    "github": "timstauffer",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADVcVIBz8UCNjQKl2GUy9ka8UGnQXAXAYw&authType=NAME_SEARCH&authToken=7Hkg&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A13988178%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907522559%2Ctas%3Astauffer",
+    "image": "https://avatars1.githubusercontent.com/u/3429096?v=3&s=460"
+  },
+  {
+    "camper": "Pete Considine",
+    "quote": "The guided and structured lessons have been really helpful, as has the relatively slow pace that new concepts are introduced. I had been taking a Udemy course and it really seemed to be skimming the surface of JavaScript in the interest of \"getting to everything.\"",
+    "github": "Pjconsidine",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAAi8-8BxUVpoi_VuJQmeGWN5zhMBgbvPbs&authType=NAME_SEARCH&authToken=WCEU&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A2290671%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907557932%2Ctas%3Apete%20c",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/3/005/06c/3b2/0ab8c08.jpg"
+  },
+  {
+    "camper": "Khatra Ahmed",
+    "quote": "I can learn to code with support by my side. Everyone is so helpful and it makes learning to code less of a struggle.",
+    "github": "Mystfreak",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAbdUsIBApacWEmL7CIxe2q7aevMn7aQvmQ&authType=NAME_SEARCH&authToken=a_zs&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A115167938%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907569985%2Ctas%3Akhatra",
+    "image": "https://avatars0.githubusercontent.com/u/11299138?v=3&s=460"
+  },
+  {
+    "camper": "Miranda Bashore",
+    "quote": "I want to be able to freelance and create dynamic websites. Free Code Camp makes that more of a reality for me, as I cannot afford an expensive bootcamp while getting my Master’s degree.",
+    "github": "DutchBay",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA8KmJMBTtvvgJzjeAUo_YOssh2yLZZlvlk&authType=NAME_SEARCH&authToken=fWay&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A252352659%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907584953%2Ctas%3Amiranda",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/005/078/187/0ca3604.jpg"
+  },
+  {
+    "camper": "Marcus Lyons",
+    "quote": "Free Code Camp has helped me gain the confidence to automate part of my work responsibilities. I was able to use skills I learned from Free Code Camp to help with writing a bash script to search through mobile app database log files to find errors.",
+    "github": "auron1223",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA_1aLABo1pVJH9ijSqz8PvLgpzVYkIsjVc&authType=NAME_SEARCH&authToken=cNE6&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A267741360%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441925486836%2Ctas%3Alyons",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAM9AAAAJDA4YjM1NGIxLThjZWYtNDllMi04N2NkLWMzMzk1YWI1MTYyMg.jpg"
+  },
+  {
+    "camper": "Reynald Emmanuel Endaya",
+    "quote": "There is an active community (even in Manila) and it’s interactive, unlike all the MOOCs I tried before where I had to listen to somebody speak for a long time. I am learning a lot here and I have not yet lost my momentum.",
+    "github": "None Given",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAUlm8oBQuXm_Y89_LDC9mb2vOjjQH_pZDo&authType=NAME_SEARCH&authToken=4WJf&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A86350794%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907601893%2Ctas%3Areynald",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/2/000/1a7/0ab/089b5aa.jpg"
+  },
+  {
+    "camper": "Victoria Kariolic",
+    "quote": "I discovered a coding partner through the Free Code Camp groups who has been able to cover gaps for my client work.",
+    "github": "Niaskywalk",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAEFmXMBlTFIR2j1G-vJhAMsUOPONILGrLM&authType=NAME_SEARCH&authToken=yGV-&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A17144179%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907613265%2Ctas%3Avictoria%20",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/8/005/025/299/0d297ae.jpg"
+  },
+  {
+    "camper": "Cameron Eshgh",
+    "quote": "Free Code Camp enables me as a digital marketer to dive right into whatever asset or content and fix things that haven’t been working, as well as roll up my sleeves when our web developers are not available.",
+    "github": "eshghitude",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAVdU1MBFFiei4ZYNImnVDcR3H_EiuS6qLY&authType=NAME_SEARCH&authToken=TlgU&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A90002259%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907626390%2Ctas%3Acameron%20",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/6/005/0a4/178/079a07b.jpg"
+  },
+  {
+    "camper": "Marquina M Iliev-Piselli",
+    "quote": "I’m re-designing a site for my full-time job.",
+    "github": "Marquina",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAACYvVUBTuu8dNRHthN1TFiyk137PLDqnv4&authType=NAME_SEARCH&authToken=V_iG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A10009941%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907639677%2Ctas%3Amarquin",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAZLAAAAJDQ5Nzg4MjJmLWUyMjQtNDI5Ny05NmY5LTE5Yjc1Y2Q1YWFhOA.jpg"
+  },
+  {
+    "camper": "Igor Tchounkovskii",
+    "quote": "I enjoy the community and the ability to get help quickly and easily through gitter. Waiting for a response on stack overflow is a little annoying.",
+    "github": "Igorkovski",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAJwXpoB2JcheJuG_QxV6pv49ve_Idm2kEU&authType=NAME_SEARCH&authToken=8TUQ&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A40918682%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907655158%2Ctas%3Aigor%20",
+    "image": "https://www.linkedin.com/profile/view?id=AAkAAAJwXpoB2JcheJuG_QxV6pv49ve_Idm2kEU&authType=NAME_SEARCH&authToken=8TUQ&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A40918682%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907655158%2Ctas%3Aigor%20"
+  },
+  {
+    "camper": "John Ellis",
+    "quote": "Free Code Camp has been one of the major contributors to my career in software development. I started as an apps analyst, spent 3 months going through the coursework in my off time and weekends, and just landed a job as a business systems developer.",
+    "github": "johnmellis",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAbrISEBqAVYOBfhni9mB3YoFFzzrAbYvvo&authType=NAME_SEARCH&authToken=jurJ&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A116072737%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907670143%2Ctas%3Ajohn%20ellis",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/000/268/01a/0492529.jpg"
+  },
+  {
+    "camper": "Devarsh Ruparelia",
+    "quote": "Free Code Camp hasn’t enabled me to join a great startup as a full-fledged developer (partly because I am new and partly because I am still just a high school student). However, it did get the startup founders interested in me and provided me an ancillary internship as Product & Operations Analyst. If I finish the full track of Free Code Camp they will strongly consider me for their programming jobs. Thanks Free Code Camp!",
+    "github": "devarsh1997",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAApxpP8BZBcHQzr6Ci3xmkkZX-OSH_oLuJs&authType=NAME_SEARCH&authToken=wdjb&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A175219967%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907682493%2Ctas%3Adevarsh",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/7/005/087/339/14535ee.jpg"
+  },
+  {
+    "camper": "Christian Morera",
+    "quote": "Free Code Camp has been a great experience. I’ve learned so many things. I am in the process of transitioning from content developer to full stack developer.",
+    "github": "chrmorfeus",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAMc-tYBtYri0H1KHz1WNQjWxZ23jg0tMNU&authType=NAME_SEARCH&authToken=NzUg&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A52230870%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907694834%2Ctas%3Achristian",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAa-AAAAJDVkYmQyNTdmLTJkM2UtNDRjNi04NjZkLThlMmE3ZTg0NzhlZQ.jpg"
+  },
+  {
+    "camper": "James Allen",
+    "quote": "I finally feel like I can learn to code in my own time and progress to the point of employability.",
+    "github": "None Given",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA4OrsIB5WyfuqeECSQO7HYisImVMDiFBl0&authType=NAME_SEARCH&authToken=Uxjm&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A235843266%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907723968%2Ctas%3Ajames%20allen",
+    "image": "https://media.licdn.com/media/p/5/000/228/30b/1bb1c6f.jpg"
+  },
+  {
+    "camper": "Jason Arnold",
+    "quote": "I like self-paced learning, so Free Code Camp has been great. The challenges are difficult enough to push boundaries but not so tough to scare people off.",
+    "github": "thejasonfile",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAABlImsBwAEZ3u3A5NIlCegho8WZ2j4h0w0&authType=NAME_SEARCH&authToken=gaxA&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A6627947%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907738051%2Ctas%3Ajason%20arn",
+    "image": "https://media.licdn.com/media/p/6/005/05d/271/0bdaef1.jpg"
+  },
+  {
+    "camper": "Kaveet Laxmidas",
+    "quote": "Free Code Camp is inspiring me to overhaul some of my old open source projects using more modern approaches and technologies.",
+    "github": "kaveet",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABZooOgBZJg_0MAJ09pd5vROk83oBFA1cEE&authType=NAME_SEARCH&authToken=52Ju&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A375955688%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907749550%2Ctas%3Akaveet%20",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAMiAAAAJDlhMGNiYzdjLTNlZmEtNDI3MC04Mzg4LTU4YTBkYjkxYTg5Zg.jpg"
+  },
+  {
+    "camper": "Brett Guillory",
+    "quote": "Free Code Camp has given me a great, goal oriented curriculum to learn exactly what I was looking for. And best of all it’s 100% free!",
+    "github": "Kurzninja",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAUMPqMBa6GwMTkA_oHUeqnZzyD95FisjwM&authType=NAME_SEARCH&authToken=-mt1&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A84688547%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907760167%2Ctas%3Abrett",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/005/054/0cd/0fee17b.jpg"
+  },
+  {
+    "camper": "Kory J. Campbell",
+    "quote": "I just graduated university, so my financial status is pretty meager, however this camp has definitely helped me improve my skills.",
+    "github": "@koryjcampbell [sic]",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAtxvTgB0N_uJhW-87Dew4wHyeqLUP-XyZk&authType=NAME_SEARCH&authToken=0hqw&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A192003384%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907770739%2Ctas%3Akory",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/4/000/17a/3cd/3b781f4.jpg"
+  },
+  {
+    "camper": "Bryon Christopher Miller",
+    "quote": "Free Code Camp has given me a free, online opportunity to study full stack JavaScript in a structured, community-based format. I am very grateful for this opportunity.",
+    "github": "bryonmiller",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABEXhHoBxj3Uiq7I0a5v1pVkeJ1gWycbm90&authType=NAME_SEARCH&authToken=4klF&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A286753914%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907784405%2Ctas%3Abryon",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/7/005/07d/040/1d3ca82.jpg"
+  },
+  {
+    "camper": "Darren Joy",
+    "quote": "Great learning opportunity. Good coding challenges and I’m meeting some very motivated people.",
+    "github": "Darrenfj",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAARv6UIBWeXw4ZfCJ70kBKgnhcv8XgnVsa8&authType=NAME_SEARCH&authToken=fMvj&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A74443074%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907795737%2Ctas%3Adarren",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAANwAAAAJGRiNjA5Zjg4LTE0OTEtNGVlNi1hZjdlLWFkOWZhNzk2YzJiNg.jpg"
+  },
+  {
+    "camper": "Stephen Mayeux",
+    "quote": "Free Code Camp is helpful because it’s not 100% hand-holding, and it pushes me out of my comfort zone.",
+    "github": "stephenmayeux",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAjTe7cBhjovoz6zTE_M6MwZ_rr3szhiSOM&authType=NAME_SEARCH&authToken=s6xI&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A148077495%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907806830%2Ctas%3Astephen",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/4/000/164/1d5/31a89f4.jpg"
+  },
+  {
+    "camper": "John Hillegass",
+    "quote": "Free Code Camp has given me the confidence that I need when heading into high level client meetings and developer scrum sessions.",
+    "github": "Ohillio",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAWEO3AB51y8eR2tYF8nydQb8kANkdPwR5U&authType=NAME_SEARCH&authToken=Pzvi&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A92552048%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907818081%2Ctas%3Ajohn%20hille",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/2/000/1cd/27b/2ab4573.jpg"
+  },
+  {
+    "camper": "Eric Hartline",
+    "quote": "The community is very helpful, and I have already accomplished so much more than what I did with other self-guided courses.",
+    "github": "wildlifehexagon",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAFitUwByB_tgxdExntMnakgQnTK1H3eEd8&authType=NAME_SEARCH&authToken=230A&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A23246156%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907829391%2Ctas%3Aeric%20har",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/2/000/1e1/095/12800b6.jpg"
+  },
+  {
+    "camper": "Brian Grant ",
+    "quote": "It has given me a place where like minded people are learning to code together. It has also inspired me to start a code camp here in the midwest.",
+    "github": "codeseekingman",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAEUqXoBFOq1SWQrBsTMHG4ij9Ss4Qqnrtg&authType=NAME_SEARCH&authToken=a85-&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A18131322%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907840255%2Ctas%3Abrian%20g",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAANEAAAAJGY5ZjZkMDVjLTJhY2EtNDZjYS1iMDk5LTY0ZDliN2EyODUxMQ.jpg"
+  },
+  {
+    "camper": "Danielle J Moss",
+    "quote": "Aside from learning to code in a fun way, I also know I’m not alone and have somewhere to go when I do get stuck and need help.",
+    "github": "psykobilliethekid",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAV4ccABlbMXZ5VfzvlYentPOIKzFbjgbZM&authType=NAME_SEARCH&authToken=D-EU&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A91779520%2CauthType%3ANAME_SEARCH%2Cidx%3A1-4-4%2CtarId%3A1441907855210%2Ctas%3Adanielle%20",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/000/1be/2cb/16e5e39.jpg"
+  },
+  {
+    "camper": "Orcun Tonyali",
+    "quote": "The thorough curriculum helped a lot in managing my company’s website.",
+    "github": "orcuntonyali",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAVwBQIBvE3-M8pDWxzep9umHDnV6JjKmTU&authType=NAME_SEARCH&authToken=h4NM&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A91227394%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907869032%2Ctas%3Aorcun",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAI7AAAAJDE2ZGVkY2IxLTkyZDEtNDUwNS1iNmU0LWI5ZWUzYjUxZDIyMw.jpg"
+  },
+  {
+    "camper": "Brendan Murphy",
+    "quote": "I like that it isn’t just a 9 week course. The chat room and partner coding were also very helpful.",
+    "github": "dendari",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAA06V8BqPNnPod-FGRuvifILht-QwZX3YY&authType=NAME_SEARCH&authToken=9SFh&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A3467615%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907882775%2Ctas%3Abrendan%20m",
+    "image": "https://media.licdn.com/media/p/5/000/2be/073/198504b.jpg"
+  },
+  {
+    "camper": "Michael Berry",
+    "quote": "Free Code Camp has helped me learn JavaScript, jQuery, and Bootstrap as well as helped me brush up on my HTML and CSS skills. I was laid off from Boeing in April. I’m hoping to land a job as a JavaScript developer as I get closer to finishing the curriculum. I wish I had known about Free Code Camp sooner.",
+    "github": "Karnblack ",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAGRqf4BwCI3cdJw9wAPc6NlReG3fzOIQq0&authType=NAME_SEARCH&authToken=SqNG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A26323454%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907895359%2Ctas%3Amichael%20berr",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAM3AAAAJDc2YTRmMjY1LTcxNjQtNDJjOC1hYWJmLTJkMGFkMWVhYjE3Mw.jpg"
+  },
+  {
+    "camper": "Angie Canon",
+    "quote": "Free Code Camp is helping my career. I work with developers and I’m beginning to understand their world better. I can phrase questions more clearly, and begin to guess what an issue might be related to.",
+    "github": "angiecan",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAACfWbABAMsll9ovljvvsLpH317o47hNHX0&authType=NAME_SEARCH&authToken=UmUf&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A10443184%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907913670%2Ctas%3Aangie%20canon",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/8/000/20b/098/273de00.jpg"
+  },
+  {
+    "camper": "Irfan Kucuk",
+    "quote": "I’ve long been looking for a place that could keep me interested in learning how to code. I’ve tried several Codecademy and comparable places, but none have proven as engaging as Free Code Camp.",
+    "github": "Ikucuk",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA5ripkBiFAjXkB3ndO6sKiiq6gD21mk6bw&authType=NAME_SEARCH&authToken=46t_&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A241928857%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907929553%2Ctas%3Airfan%20kuc",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/4/005/027/3f1/08ce9a4.jpg"
+  },
+  {
+    "camper": "Jonathan Kvicky",
+    "quote": "Free Code Camp has given me a strong foundational advantage into pursuing a career in software/web development, and has also served as a great platform for connecting with others who share the same passion for software engineering.",
+    "github": "jonkvix",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABk3i9YB_hcw1AyVg2QHaf8KMQ8ADQ_R_vg&authType=NAME_SEARCH&authToken=0yLa&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A423070678%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907942441%2Ctas%3Ajonathan%20kv",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAANTAAAAJDk3ZGMwMjFlLTZkNDYtNDgwYy05NGE0LTk5ZjgwNGQ4NWU0OA.jpg"
+  },
+  {
+    "camper": "Susannah Skyer Gupta",
+    "quote": "As a jack-of-all-trades at a small educational software company, I’m already putting my coding skills to work, beginning to submit my own pull requests for bug fixes instead of just opening a problem ticket and waiting for someone else to fix it.",
+    "github": "SuzGupta",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAFIosEBLewkmbuudMwAqiTM5YE3wHvcE4A&authType=NAME_SEARCH&authToken=dFye&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A21537473%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907953988%2Ctas%3Asusanna",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/7/005/025/20f/3d29475.jpg"
+  },
+  {
+    "camper": "Puneet Shivanand",
+    "quote": "Free Code Camp has helped me create and maintain a website for a local bioinformatics conference.",
+    "github": "puneet-shivanand",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAArBgXABw4qoSJQoGjqrvU6_vBX1gUmcwGg&authType=NAME_SEARCH&authToken=bARS&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A180453744%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907966038%2Ctas%3Apuneet",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAUYAAAAJGI3NmNlMGNhLWM1NDEtNGNlNS1iNmQzLTY0OTM3OGEzMTk0Yg.jpg"
+  },
+  {
+    "camper": "Ian Seabrook",
+    "quote": "I’ve made connections with people I never would have approached before Free Code Camp.",
+    "github": "ianseabrook",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAuVUi4BSJ3K6fcyTa2fnZr_9Oosb3nKM34&authType=NAME_SEARCH&authToken=b7uD&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A194335278%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907982480%2Ctas%3Aian%20seabroo",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAJNAAAAJDVkMmI1MDYxLTc1ZmEtNDY0Yy05MTRhLTY1ZjVkNWQyNWI1Ng.jpg"
+  },
+  {
+    "camper": "Oleh Kuchuk",
+    "quote": "The coding exercises helped me to prepare for my first job interview.",
+    "github": "drkraken",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABgy6MwBva2OKpsffAU-OBBeTC7qahTYpGw&authType=NAME_SEARCH&authToken=Xm_u&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A405989580%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907996469%2Ctas%3Aoleh%20kuchuk",
+    "image": "NONE"
+  },
+  {
+    "camper": "Larisa Bekerman",
+    "quote": "Free Code Camp has made me more comfortable with certain aspects of code and helped me review and understand concepts in a more hands-on style. Some people learn by reading theory, I don’t understand things until I’ve made them work myself!",
+    "github": "xaosqueen",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAB-SHUBga96BB-iaHe7QFI-S2dFmeUQaq0&authType=NAME_SEARCH&authToken=CWOo&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A8276085%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908013366%2Ctas%3Alarisa%20beker",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/8/005/093/243/2c06287.jpg"
+  },
+  {
+    "camper": "Jesse Mull",
+    "quote": "I learned more using Free Code Camp in three months than I ever could have at a traditional university.",
+    "github": "jessemull",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAr2HfcBswHtmQeLM1rxDEg7GdCuxvNin5s&authType=NAME_SEARCH&authToken=nca0&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A183901687%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908026733%2Ctas%3Ajesse%20mull",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/3/005/016/3ff/006213a.jpg"
+  },
+  {
+    "camper": "Mihai Popescu",
+    "quote": "The exercises helped me hone my skills and get an internship at a tech startup. My projects were a great talking point in the interview, showing them what I did and how I approached the problems. Great thing you are doing here.",
+    "github": "Mihaisavezi",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAApQxGQBYz-WAQu_0zXPTkW-R7QbdaXEZeA&authType=NAME_SEARCH&authToken=r84S&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A173065316%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908038920%2Ctas%3Amihai%20p",
+    "image": "NONE"
+  },
+  {
+    "camper": "Zlatko Cabric",
+    "quote": "I am still in school, pursuing an AS in web development. The JavaScript course in college was a breeze thanks to Free Code Camp.",
+    "github": "zlajac ",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAsCCFMBUlE24Ie41G_YS3XhdtQMDl5vCZA&authType=NAME_SEARCH&authToken=h1m7&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A184682579%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908055072%2Ctas%3Azlat",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAALQAAAAJDMzNjY4M2UwLWVlYWEtNGQwYS04MDY0LTVjNGVhNGNhYWM5OQ.jpg"
+  },
+  {
+    "camper": "Anthony DePaolo",
+    "quote": "I can learn web development at my own pace, which is great with my crazy life’s schedule. It also doesn’t cost $10k-$17k, which I just can’t fork over right now.",
+    "github": "adepaolo",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAOCUkABzCvw3p1mBiPbbFWq91BEFXGXKxA&authType=NAME_SEARCH&authToken=7zb7&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A58872384%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908068309%2Ctas%3Aanthony%20depa",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAJPAAAAJGI4NGY3ZGI1LWM2N2UtNGQ2Ni1iZDUwLTFkN2I4YWM2YThjMQ.jpg"
+  }
+]

From febdc5b0cceb49b9745f402ed34b9d4f738da9fa Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 10 Sep 2015 17:03:16 -0700
Subject: [PATCH 029/140] hide more info button

---
 server/views/stories/hot-stories.jade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/views/stories/hot-stories.jade b/server/views/stories/hot-stories.jade
index 0905fbd79b..8cc7bb7659 100644
--- a/server/views/stories/hot-stories.jade
+++ b/server/views/stories/hot-stories.jade
@@ -47,8 +47,8 @@
                                   "<br>" +
                                   (typeof username !== 'undefined' ?
                                     "<button id='" + data[i].id + "' class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost btn-upvote'>upvote</button>" :
-                                    "<a href='/signup' class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost btn-upvote'>upvote</a>") +
-                                    "<a class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost' href='/news/" + linkedName + "'>more info</a>" +
+                                    "<a href='/signin' class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost btn-upvote'>upvote</a>") +
+                                    "<a class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a>" +
                                 "</div>" +
                             "</div>" +
                             "<div class='hidden-xs row media-stories'>" +
@@ -69,7 +69,7 @@
                                                 (typeof username !== 'undefined' ?
                                                   "<button id='" + data[i].id + "' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost btn-upvote'>upvote</button>" :
                                                   "<a href='/signin' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost'>upvote</a>") +
-                                                " · <a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost' href='/news/" + linkedName + "'>more info</a> · " +
+                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a> · " +
                                                 rank + (rank > 1 ? " points" : " point") + " · posted " +
                                                 moment(data[i].timePosted).fromNow() +
                                                 " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +

From 56673d429d7a283078ba3807ac40eb92f00b2ed6 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 6 Oct 2015 18:19:43 -0700
Subject: [PATCH 030/140] add labs

---
 seed/labs.json                   | 30 ++++++++++++++++++++++++++++++
 server/boot/randomAPIs.js        | 18 ++++++++++++++++++
 server/views/home.jade           |  5 ++---
 server/views/resources/labs.jade | 22 ++++++++++++++++++++++
 4 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 seed/labs.json
 create mode 100644 server/views/resources/labs.jade

diff --git a/seed/labs.json b/seed/labs.json
new file mode 100644
index 0000000000..5131432a29
--- /dev/null
+++ b/seed/labs.json
@@ -0,0 +1,30 @@
+[
+  {
+    "camper": "johnstonbl01",
+    "name": "Clementine.js",
+    "url": "http://johnstonbl01.github.io/clementinejs/",
+    "description": "The elegant and lightweight boilerplate for full stack JavaScript.",
+    "image": "http://i.imgur.com/ib1wOho.png"
+  },
+  {
+    "camper": "akiralaine",
+    "name": "Camper News Bot",
+    "url": "https://twitter.com/campernewsbot",
+    "description": "This twitter bot tweets out Camper News stories once they hit 5 upvotes.",
+    "image": "https://pbs.twimg.com/media/CLXOFLPWIAEHYPJ.png"
+  },
+  {
+    "camper": "adventurebear",
+    "name": "Coding Bootcamp Cost Calculator",
+    "url": "http://www.freecodecamp.com/coding-bootcamp-cost-calculator",
+    "description": "This d3.js-powered coding bootcamp cost calculator takes into account tuition, financing, lost wages and cost of living.",
+    "image": "https://qph.is.quoracdn.net/main-qimg-670d6a0c5b01f74138e777732994240f?convert_to_webp=true"
+  },
+  {
+    "camper": "ericdouglas",
+    "name": "Open Source Society",
+    "url": "https://github.com/open-source-society/computer-science",
+    "description": "A path to a free education in Computer Science.",
+    "image": "https://camo.githubusercontent.com/c42438055d3fee26b29e6d046fd8d06ebff3db20/687474703a2f2f692e696d6775722e636f6d2f6838786a72726a2e706e67"
+  }
+]
diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index bd35e05e62..c3411441ac 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -5,6 +5,8 @@ var Rx = require('rx'),
     request = require('request'),
     debug = require('debug')('freecc:cntr:resources'),
     constantStrings = require('../utils/constantStrings.json'),
+    labs = require('../../seed/labs.json'),
+    testimonials = require('../../seed/testimonials.json'),
     secrets = require('../../config/secrets');
 
 module.exports = function(app) {
@@ -32,6 +34,8 @@ module.exports = function(app) {
   router.get('/unsubscribed', unsubscribed);
   router.get('/get-started', getStarted);
   router.get('/submit-cat-photo', submitCatPhoto);
+  router.get('/labs', showLabs);
+  router.get('/success-stories', showSuccessStories);
 
   app.use(router);
 
@@ -180,6 +184,20 @@ module.exports = function(app) {
     res.redirect('https://gitter.im/FreeCodeCamp/FreeCodeCamp');
   }
 
+  function showLabs(req, res) {
+    res.render('resources/labs', {
+      title: 'Projects Built by Free Code Camp Students',
+      projects: labs
+    });
+  }
+
+  function showSuccessStories(req, res) {
+    res.render('resources/labs', {
+      title: 'Projects Built by Free Code Camp Students',
+      labs: testimonials
+    });
+  }
+
   function submitCatPhoto(req, res) {
     res.send('Submitted!');
   }
diff --git a/server/views/home.jade b/server/views/home.jade
index 9b8b65fa06..e2783f4576 100644
--- a/server/views/home.jade
+++ b/server/views/home.jade
@@ -30,9 +30,6 @@ block content
             h2 As featured in
             img.img-center.img-responsive(src='https://s3.amazonaws.com/freecodecamp/as-seen-on.png')
             .spacer
-            h2 We're a proven way to start your software engineering career:
-            img.img-center.img-responsive(src='https://s3.amazonaws.com/freecodecamp/linkedin-alumni.png')
-            .spacer
             h2 Campers you'll hang out with:
             .row
                 .col-xs-12.col-sm-12.col-md-4
@@ -47,6 +44,8 @@ block content
                     img.img-responsive.testimonial-image.img-center(src="https://s3.amazonaws.com/freecodecamp/testimonial-cynthia.jpg", alt="@cynthialanel's testimonial image")
                     .testimonial-copy  I'm currently working through Free Code Camp to improve my JavaScript. The community is very welcoming!
                     h3 - @cynthialanel
+            .button-spacer
+            .btn.btn-primary.btn-block(a href='/success-stories') See more successful campers
             .big-break
             h2 Skills you'll learn:
             .text-center.negative-35
diff --git a/server/views/resources/labs.jade b/server/views/resources/labs.jade
new file mode 100644
index 0000000000..e3f3a41577
--- /dev/null
+++ b/server/views/resources/labs.jade
@@ -0,0 +1,22 @@
+extends ../layout
+block content
+    .panel.panel-info
+        .panel-heading.text-center Projects Created by Free Code Camp Campers
+        .panel-body.text-left
+            .row
+                .col-xs-12.col-sm-10.col-sm-offset-1
+                    for project in projects
+                        .spacer
+                        .row
+                            .col-xs-12.col-sm-3
+                                img.img-responsive(src=project.image)
+                            .col-xs-12.col-sm-9.negative-15
+                                h3
+                                    a(href=project.url) #{project.name}
+                                h4 by&thinsp;
+                                    a(href='/' + project.camper) #{project.camper}
+                                p= project.description
+
+            if !user
+                a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free)
+            .spacer

From 4f26d82f65e766e0e80e3b70adbb102666cbed48 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 6 Oct 2015 21:28:00 -0700
Subject: [PATCH 031/140] add labs and stories

---
 client/less/main.less                    |  4 +
 seed/{testimonials.json => stories.json} | 99 ++++++++++++------------
 server/boot/randomAPIs.js                | 12 +--
 server/views/home.jade                   |  6 +-
 server/views/resources/stories.jade      | 22 ++++++
 5 files changed, 86 insertions(+), 57 deletions(-)
 rename seed/{testimonials.json => stories.json} (96%)
 create mode 100644 server/views/resources/stories.jade

diff --git a/client/less/main.less b/client/less/main.less
index 067290e9be..62fdadff4a 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -490,6 +490,10 @@ thead {
   border-radius: 5px;
 }
 
+.story-section {
+  min-height: 500px;
+}
+
 .testimonial-copy {
   font-size: 20px;
   text-align: center;
diff --git a/seed/testimonials.json b/seed/stories.json
similarity index 96%
rename from seed/testimonials.json
rename to seed/stories.json
index 40f24a2488..1f9b560852 100644
--- a/seed/testimonials.json
+++ b/seed/stories.json
@@ -7,11 +7,32 @@
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/8/005/09e/16e/32c3d3f.jpg"
   },
   {
-    "camper": "Brian Emory",
-    "quote": "I like to learn by doing but with the books, while very informative, there was more reading than doing. I came across Free Code Camp which has allowed me to learn by doing. Whereas before I was struggling to learn, I am now not only learning but learning while building cool projects.",
-    "github": "thebrianemory",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABc3jXwB-iZdZKZIVAvL93RHGB7_J9gDbVA&authType=NAME_SEARCH&authToken=w1Km&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A389516668%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907166795%2Ctas%3Abrian%20emory",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAJOAAAAJDgyZWFhYWFjLTNhZGYtNGQzOC04M2JjLWE1Nzk1NmRiMDY4MA.jpg"
+    "camper": "Branden Byers",
+    "quote": "Could I have gotten a job without Free Code Camp? Eventually, sure. But Free Code Camp provided a far denser experience than in my roughly 24 previous years of dabbling in tech.",
+    "github": "brandenbyers",
+    "linkedin": "https://www.linkedin.com/in/brandenbyers",
+    "image": "https://pbs.twimg.com/profile_images/539515557184167936/JqJXzV9x.jpeg"
+  },
+  {
+    "camper": "Qing Huang",
+    "quote": "Free Code Camp gives me more confidence at work. Code doesn’t look as foreign anymore.",
+    "github": "qingillustrates",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAOjjjoBDaPY1dtpvngnr8ednNTran6KA3s&authType=NAME_SEARCH&authToken=4zvM&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A61050426%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907310565%2Ctas%3Aqing",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAKsAAAAJDVlNmNkMzUwLWFjNzAtNDQ4OS05NWI5LWYyYmYzOWQzZjRlOQ.jpg"
+  },
+  {
+    "camper": "John Ellis",
+    "quote": "Free Code Camp has been one of the major contributors to my career in software development. I started as an apps analyst, spent 3 months going through the coursework in my off time and weekends, and just landed a job as a business systems developer.",
+    "github": "johnmellis",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAbrISEBqAVYOBfhni9mB3YoFFzzrAbYvvo&authType=NAME_SEARCH&authToken=jurJ&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A116072737%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907670143%2Ctas%3Ajohn%20ellis",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/000/268/01a/0492529.jpg"
+  },
+  {
+    "camper": "Lori Becker",
+    "quote": "After graduating with a Masters degree in computer science, I could not share any of my code with employers (university policy: fear of aiding cheating). With FreeCodeCamp, I was able to develop a small portfolio.",
+    "github": "LCBecker",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADrtuwBOA_0ihkKIbUFXoXskXikQT9uVeo&authType=NAME_SEARCH&authToken=sctO&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A15447788%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907195702%2Ctas%3Alori",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/1/005/080/392/295a574.jpg"
   },
   {
     "camper": "Ryan Lindeman",
@@ -21,11 +42,25 @@
     "image": "https://media.licdn.com/media/p/4/000/145/24d/18e8af8.jpg"
   },
   {
-    "camper": "Lori Becker",
-    "quote": "After graduating with a Masters degree in computer science, I could not share any of my code with employers (university policy: fear of aiding cheating). With FreeCodeCamp, I was able to develop a small portfolio.",
-    "github": "LCBecker",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADrtuwBOA_0ihkKIbUFXoXskXikQT9uVeo&authType=NAME_SEARCH&authToken=sctO&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A15447788%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907195702%2Ctas%3Alori",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/1/005/080/392/295a574.jpg"
+    "camper": "Stephanie Brown",
+    "quote": "Free Code Camp has given me structure and a direction while learning to code.",
+    "github": "strawmitch",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAARqP5cBDDdBxPUzluctvjUhOP3UsiowRtM&authType=NAME_SEARCH&authToken=TDfV&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A74071959%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907473116%2Ctas%3Astephanie%20brown",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAALJAAAAJGI5ZWY1MmNjLTJhMTUtNGI2NS04YTExLTFiOGZlYTRiMTNiOA.jpg"
+  },
+  {
+    "camper": "Jimson Sulit",
+    "quote": "Aside from the fact that I’m learning full stack web development, Free Code Camp has also given me the opportunity to lead local community projects.",
+    "github": "webdevjedi25",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAWqUccBopX2Wo_P1gYgy0iIEqChwXPTh2k&authType=NAME_SEARCH&authToken=kd5y&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A95048135%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907446780%2Ctas%3Ajimson",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAPzAAAAJDYyOGMxYmEyLTY1NTQtNDE3NS1iMmVkLWUwM2M4NjJiZWFhZg.jpg"
+  },
+  {
+    "camper": "Brian Emory",
+    "quote": "I like to learn by doing but with the books, while very informative, there was more reading than doing. I came across Free Code Camp which has allowed me to learn by doing. Whereas before I was struggling to learn, I am now not only learning but learning while building cool projects.",
+    "github": "thebrianemory",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABc3jXwB-iZdZKZIVAvL93RHGB7_J9gDbVA&authType=NAME_SEARCH&authToken=w1Km&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A389516668%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907166795%2Ctas%3Abrian%20emory",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAJOAAAAJDgyZWFhYWFjLTNhZGYtNGQzOC04M2JjLWE1Nzk1NmRiMDY4MA.jpg"
   },
   {
     "camper": "Brian Barrow",
@@ -76,13 +111,6 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAZRM5MBACvQe36s4cvpe5ZHWEfgxprDUFg&authType=NAME_SEARCH&authToken=pozh&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A105984915%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907298390%2Ctas%3Akristin%20",
     "image": "https://media.licdn.com/media/p/4/005/0b3/377/381a362.jpg"
   },
-  {
-    "camper": "Qing Huang",
-    "quote": "Free Code Camp gives me more confidence at work. Code doesn’t look as foreign anymore.",
-    "github": "qingillustrates",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAOjjjoBDaPY1dtpvngnr8ednNTran6KA3s&authType=NAME_SEARCH&authToken=4zvM&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A61050426%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907310565%2Ctas%3Aqing",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAKsAAAAJDVlNmNkMzUwLWFjNzAtNDQ4OS05NWI5LWYyYmYzOWQzZjRlOQ.jpg"
-  },
   {
     "camper": "Jimmy Epperson",
     "quote": "I learned to build websites, which is now a new service I offer to local businesses.",
@@ -139,13 +167,6 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAI53oUBmy6MPKp1UeHxBy3_y0cyTS4bWow&authType=NAME_SEARCH&authToken=gz62&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A37346949%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907434768%2Ctas%3Arhona",
     "image": "https://media.licdn.com/media/p/7/005/0aa/319/1aaa08f.jpg"
   },
-  {
-    "camper": "Jimson Sulit",
-    "quote": "Aside from the fact that I’m learning full stack web development, Free Code Camp has also given me the opportunity to lead local community projects.",
-    "github": "webdevjedi25",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAWqUccBopX2Wo_P1gYgy0iIEqChwXPTh2k&authType=NAME_SEARCH&authToken=kd5y&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A95048135%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907446780%2Ctas%3Ajimson",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAPzAAAAJDYyOGMxYmEyLTY1NTQtNDE3NS1iMmVkLWUwM2M4NjJiZWFhZg.jpg"
-  },
   {
     "camper": "Nick Galluzzo",
     "quote": "I currently work in a support role for a tech startup (www.knackhq.com). The more I learn about JavaScript, the more I’m able to contribute to a product I really believe in!",
@@ -153,13 +174,6 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAjQl1EBZPrbUQ6zGPXmKIuNzpCyqqsnox4&authType=NAME_SEARCH&authToken=9w-G&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A147887953%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907461071%2Ctas%3Anick%20gall",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAANtAAAAJDE3YWZmYjE0LTg4ODYtNDg1Mi1hZDhjLThkZmZhMjkxYWI3Mg.jpg"
   },
-  {
-    "camper": "Stephanie Brown",
-    "quote": "Free Code Camp has given me structure and a direction while learning to code.",
-    "github": "strawmitch",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAARqP5cBDDdBxPUzluctvjUhOP3UsiowRtM&authType=NAME_SEARCH&authToken=TDfV&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A74071959%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907473116%2Ctas%3Astephanie%20brown",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAALJAAAAJGI5ZWY1MmNjLTJhMTUtNGI2NS04YTExLTFiOGZlYTRiMTNiOA.jpg"
-  },
   {
     "camper": "Genavieve Clausen",
     "quote": "Free Code Camp has benefitted me in numerous ways, including the opportunity to learn in a self-paced, supportive environment. I am excited to be a part of a growing community making lasting connections for the career and lifestyle I am pursuing.",
@@ -230,23 +244,10 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAACYvVUBTuu8dNRHthN1TFiyk137PLDqnv4&authType=NAME_SEARCH&authToken=V_iG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A10009941%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907639677%2Ctas%3Amarquin",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAZLAAAAJDQ5Nzg4MjJmLWUyMjQtNDI5Ny05NmY5LTE5Yjc1Y2Q1YWFhOA.jpg"
   },
-  {
-    "camper": "Igor Tchounkovskii",
-    "quote": "I enjoy the community and the ability to get help quickly and easily through gitter. Waiting for a response on stack overflow is a little annoying.",
-    "github": "Igorkovski",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAJwXpoB2JcheJuG_QxV6pv49ve_Idm2kEU&authType=NAME_SEARCH&authToken=8TUQ&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A40918682%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907655158%2Ctas%3Aigor%20",
-    "image": "https://www.linkedin.com/profile/view?id=AAkAAAJwXpoB2JcheJuG_QxV6pv49ve_Idm2kEU&authType=NAME_SEARCH&authToken=8TUQ&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A40918682%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907655158%2Ctas%3Aigor%20"
-  },
-  {
-    "camper": "John Ellis",
-    "quote": "Free Code Camp has been one of the major contributors to my career in software development. I started as an apps analyst, spent 3 months going through the coursework in my off time and weekends, and just landed a job as a business systems developer.",
-    "github": "johnmellis",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAbrISEBqAVYOBfhni9mB3YoFFzzrAbYvvo&authType=NAME_SEARCH&authToken=jurJ&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A116072737%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907670143%2Ctas%3Ajohn%20ellis",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/000/268/01a/0492529.jpg"
-  },
+
   {
     "camper": "Devarsh Ruparelia",
-    "quote": "Free Code Camp hasn’t enabled me to join a great startup as a full-fledged developer (partly because I am new and partly because I am still just a high school student). However, it did get the startup founders interested in me and provided me an ancillary internship as Product & Operations Analyst. If I finish the full track of Free Code Camp they will strongly consider me for their programming jobs. Thanks Free Code Camp!",
+    "quote": "Even though I am still just a high school student. The startup I intern for said that if I finish the full track of Free Code Camp, they will strongly consider me for their programming jobs. Thanks Free Code Camp!",
     "github": "devarsh1997",
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAApxpP8BZBcHQzr6Ci3xmkkZX-OSH_oLuJs&authType=NAME_SEARCH&authToken=wdjb&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A175219967%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907682493%2Ctas%3Adevarsh",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/7/005/087/339/14535ee.jpg"
@@ -312,7 +313,7 @@
     "quote": "Free Code Camp is helpful because it’s not 100% hand-holding, and it pushes me out of my comfort zone.",
     "github": "stephenmayeux",
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAjTe7cBhjovoz6zTE_M6MwZ_rr3szhiSOM&authType=NAME_SEARCH&authToken=s6xI&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A148077495%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907806830%2Ctas%3Astephen",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/4/000/164/1d5/31a89f4.jpg"
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAUmAAAAJDg3MzIzMGVlLWYzZGEtNGE0Yi05ODkzLTFkODkyOWI5N2NjYg.jpg"
   },
   {
     "camper": "John Hillegass",
@@ -410,7 +411,7 @@
     "quote": "The coding exercises helped me to prepare for my first job interview.",
     "github": "drkraken",
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABgy6MwBva2OKpsffAU-OBBeTC7qahTYpGw&authType=NAME_SEARCH&authToken=Xm_u&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A405989580%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907996469%2Ctas%3Aoleh%20kuchuk",
-    "image": "NONE"
+    "image": "https://pbs.twimg.com/profile_images/518155039781580800/djkuOlrL.jpeg"
   },
   {
     "camper": "Larisa Bekerman",
@@ -431,7 +432,7 @@
     "quote": "The exercises helped me hone my skills and get an internship at a tech startup. My projects were a great talking point in the interview, showing them what I did and how I approached the problems. Great thing you are doing here.",
     "github": "Mihaisavezi",
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAApQxGQBYz-WAQu_0zXPTkW-R7QbdaXEZeA&authType=NAME_SEARCH&authToken=r84S&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A173065316%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908038920%2Ctas%3Amihai%20p",
-    "image": "NONE"
+    "image": "https://lh6.googleusercontent.com/-4JB6FPzm9ZE/VakUEj7WYsI/AAAAAAAALkU/4C0ILUwn-B8/w888-h891-no/profilepic.png"
   },
   {
     "camper": "Zlatko Cabric",
diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index c3411441ac..739abe12ca 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -6,7 +6,7 @@ var Rx = require('rx'),
     debug = require('debug')('freecc:cntr:resources'),
     constantStrings = require('../utils/constantStrings.json'),
     labs = require('../../seed/labs.json'),
-    testimonials = require('../../seed/testimonials.json'),
+    stories = require('../../seed/stories.json'),
     secrets = require('../../config/secrets');
 
 module.exports = function(app) {
@@ -35,7 +35,7 @@ module.exports = function(app) {
   router.get('/get-started', getStarted);
   router.get('/submit-cat-photo', submitCatPhoto);
   router.get('/labs', showLabs);
-  router.get('/success-stories', showSuccessStories);
+  router.get('/stories', showStories);
 
   app.use(router);
 
@@ -191,10 +191,10 @@ module.exports = function(app) {
     });
   }
 
-  function showSuccessStories(req, res) {
-    res.render('resources/labs', {
-      title: 'Projects Built by Free Code Camp Students',
-      labs: testimonials
+  function showStories(req, res) {
+    res.render('resources/stories', {
+      title: 'Stories from Happy Free Code Camp Campers',
+      stories: stories
     });
   }
 
diff --git a/server/views/home.jade b/server/views/home.jade
index e2783f4576..b7f796ae4f 100644
--- a/server/views/home.jade
+++ b/server/views/home.jade
@@ -27,7 +27,7 @@ block content
                     a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free)
                     .button-spacer
                     a.btn.btn-cta.btn-success.btn-block(href="/nonprofits") My nonprofit needs coding help
-            h2 As featured in
+            h2 As featured in:
             img.img-center.img-responsive(src='https://s3.amazonaws.com/freecodecamp/as-seen-on.png')
             .spacer
             h2 Campers you'll hang out with:
@@ -45,7 +45,9 @@ block content
                     .testimonial-copy  I'm currently working through Free Code Camp to improve my JavaScript. The community is very welcoming!
                     h3 - @cynthialanel
             .button-spacer
-            .btn.btn-primary.btn-block(a href='/success-stories') See more successful campers
+            .row
+                .col-xs-12.col-sm-8.col-sm-offset-2
+                    a.btn.btn-big.btn-primary.btn-block(href='/stories') Hear from more of our campers
             .big-break
             h2 Skills you'll learn:
             .text-center.negative-35
diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade
new file mode 100644
index 0000000000..a5b7260c50
--- /dev/null
+++ b/server/views/resources/stories.jade
@@ -0,0 +1,22 @@
+extends ../layout
+block content
+    .panel.panel-info
+        .panel-heading.text-center Stories from happy campers
+        .panel-body.text-left
+            .row
+                .col-xs-12.col-sm-10.col-sm-offset-1
+                    .row
+                        for story in stories
+                            .col-xs-12.col-sm-6.col-md-4
+                                .story-section
+                                    a(href=story.linkedin target='_blank')
+                                        img.testimonial-image.img-responsive.img-center(src=story.image)
+                                    h3.text-center
+                                        a(href=story.linkedin target='_blank')= story.camper
+                                    p.text-justify= story.quote
+                                    .text-center
+
+
+            if !user
+                a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free)
+            .spacer

From ea827fda37df7ac89d7d110b0bf2f7dcb77a7a6b Mon Sep 17 00:00:00 2001
From: Quincy Larson <QuincyLarson@users.noreply.github.com>
Date: Wed, 7 Oct 2015 00:09:43 -0700
Subject: [PATCH 032/140] Remove unnecessary dangling class

---
 server/views/resources/stories.jade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade
index a5b7260c50..0d9b21d999 100644
--- a/server/views/resources/stories.jade
+++ b/server/views/resources/stories.jade
@@ -14,7 +14,6 @@ block content
                                     h3.text-center
                                         a(href=story.linkedin target='_blank')= story.camper
                                     p.text-justify= story.quote
-                                    .text-center
 
 
             if !user

From 7a4f5d752ca4510abec8981677fbda53350ff480 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 00:26:17 -0700
Subject: [PATCH 033/140] Move labs/stories to server/resources Rename stories
 to testimonials to reduce confusion

---
 server/boot/labs.js                                    |  0
 server/boot/randomAPIs.js                              | 10 +++++-----
 {seed => server/resources}/labs.json                   |  0
 .../stories.json => server/resources/testimonials.json |  0
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 server/boot/labs.js
 rename {seed => server/resources}/labs.json (100%)
 rename seed/stories.json => server/resources/testimonials.json (100%)

diff --git a/server/boot/labs.js b/server/boot/labs.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index 739abe12ca..95e943e526 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -5,8 +5,8 @@ var Rx = require('rx'),
     request = require('request'),
     debug = require('debug')('freecc:cntr:resources'),
     constantStrings = require('../utils/constantStrings.json'),
-    labs = require('../../seed/labs.json'),
-    stories = require('../../seed/stories.json'),
+    labs = require('../resources/labs.json'),
+    testimonials = require('../resources/testimonials.json'),
     secrets = require('../../config/secrets');
 
 module.exports = function(app) {
@@ -35,7 +35,7 @@ module.exports = function(app) {
   router.get('/get-started', getStarted);
   router.get('/submit-cat-photo', submitCatPhoto);
   router.get('/labs', showLabs);
-  router.get('/stories', showStories);
+  router.get('/stories', showTestimonials);
 
   app.use(router);
 
@@ -191,10 +191,10 @@ module.exports = function(app) {
     });
   }
 
-  function showStories(req, res) {
+  function showTestimonials(req, res) {
     res.render('resources/stories', {
       title: 'Stories from Happy Free Code Camp Campers',
-      stories: stories
+      stories: testimonials
     });
   }
 
diff --git a/seed/labs.json b/server/resources/labs.json
similarity index 100%
rename from seed/labs.json
rename to server/resources/labs.json
diff --git a/seed/stories.json b/server/resources/testimonials.json
similarity index 100%
rename from seed/stories.json
rename to server/resources/testimonials.json

From 241ca8097df4f8522732274550536cc2478a280e Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 00:28:42 -0700
Subject: [PATCH 034/140] Fix link errors in randomAPIs

---
 server/boot/randomAPIs.js | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index 95e943e526..c9f3a54f0e 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -100,10 +100,10 @@ module.exports = function(app) {
             });
         },
 
-        challenges: function (callback) {
+        challenges: function(callback) {
           Challenge.find(
             { fields: { name: true } },
-            function (err, challenges) {
+            function(err, challenges) {
               if (err) {
                 debug('Challenge err: ', err);
                 callback(err);
@@ -120,10 +120,10 @@ module.exports = function(app) {
               }
             });
         },
-        stories: function (callback) {
+        stories: function(callback) {
           Story.find(
             { field: { link: true } },
-            function (err, stories) {
+            function(err, stories) {
               if (err) {
                 debug('Story err: ', err);
                 callback(err);
@@ -141,7 +141,7 @@ module.exports = function(app) {
             }
           );
         },
-        nonprofits: function (callback) {
+        nonprofits: function(callback) {
           Nonprofit.find(
             { field: { name: true } },
             function(err, nonprofits) {
@@ -215,13 +215,6 @@ module.exports = function(app) {
     });
   }
 
-  function catPhotoSubmit(req, res) {
-    res.send(
-      'Success! You have submitted your cat photo. Return to your website ' +
-      'by typing any letter into your code editor.'
-    );
-  }
-
   function sponsors(req, res) {
     res.render('sponsors/sponsors', {
       title: 'The Sponsors who make Free Code Camp Possible'
@@ -265,7 +258,7 @@ module.exports = function(app) {
           return next(err);
         }
         user.sendMonthlyEmail = false;
-        user.save(function () {
+        user.save(function() {
           if (err) {
             return next(err);
           }
@@ -320,7 +313,7 @@ module.exports = function(app) {
             secrets.github.clientSecret
           ].join(''),
           githubHeaders,
-          function (err, status2, issues) {
+          function(err, status2, issues) {
             if (err) { return next(err); }
             issues = ((pulls === parseInt(pulls, 10)) && issues) ?
             Object.keys(JSON.parse(issues)).length - pulls :
@@ -354,7 +347,7 @@ module.exports = function(app) {
       'https://www.googleapis.com/blogger/v3/blogs/2421288658305323950/' +
         'posts?key=' +
       secrets.blogger.key,
-      function (err, status, blog) {
+      function(err, status, blog) {
         if (err) { return next(err); }
 
         blog = (status && status.statusCode === 200) ?

From cd964425f72f9291c2aabcc7e3150146b1fd263d Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 6 Oct 2015 23:11:13 -0700
Subject: [PATCH 035/140] add t-shirt banner

---
 server/views/challengeMap/show.jade | 70 ++++++++++-------------------
 1 file changed, 23 insertions(+), 47 deletions(-)

diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index 42fa90422b..12eb19abdd 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -18,35 +18,17 @@ block content
                     span.text-primary #{daysRunning} &thinsp;
                     | days ago.
                 .spacer
-                if (user && !user.tshirtVote && user.progressTimestamps.length > 5)
-                    h3.text-center Vote for the T-shirt design you like the most.
-                    h4.text-center We'll announce the winning design during our Summit on Saturday at Noon EST on&thinsp;
-                        a(href='https://twitch.tv/freecodecamp' target='_blank') Twitch.tv
-                        | &thinsp;and it will become our community's first official t-shirt (in women's and men's sizes).
-                    .row
-                        .col-xs-6
-                            a(href="http://i.imgur.com/LlXGa5y.png" data-lightbox="img-enlarge")
-                                img.img-responsive(src='http://i.imgur.com/LlXGa5y.png' alt="t-shirt option 1 women's")
-                        .col-xs-6
-                            a(href="http://i.imgur.com/aefwnnv.png" data-lightbox="img-enlarge")
-                                img.img-responsive(src='http://i.imgur.com/aefwnnv.png' alt="t-shirt option 2 women's")
-                    .button-spacer
-                    .row
-                        .col-xs-6
-                            a(href="http://i.imgur.com/aYH0aqf.png" data-lightbox="img-enlarge")
-                                img.img-responsive(src='http://i.imgur.com/aYH0aqf.png' alt="t-shirt option 1 men's")
-                        .col-xs-6
-                            a(href="http://i.imgur.com/v9KlV4g.png" data-lightbox="img-enlarge")
-                                img.img-responsive(src='http://i.imgur.com/v9KlV4g.png' alt="t-shirt option 2 men's")
-                    .button-spacer
-                    .row
-                        .col-xs-6
-                            h3.text-center "Minified JavaScript Logo"
-                            a.button.btn.btn-block.btn-primary(href='/vote1') Vote for this Design
-                        .col-xs-6
-                            h3.text-center "Function Call Logo"
-                            a.button.btn.btn-block.btn-primary(href='/vote2') Vote for this design
-                    .spacer
+                if (user && user.progressTimestamps.length > 5)
+                    #tshirt-notice.col-xs-12.col-md-8.col-md-offset-2.hidden
+                        h2.text-center Get our first-edition t-shirt
+                        img.thumbnail.img-center.img-responsive(src="http://i.imgur.com/o07uuOL.png")
+                        p.text-justify Our community has voted. Get our winning design emblazoned on a durable, American-made American Apparel shirt (available in women's and men's sizes).&thinsp;
+                            a(href="https://teespring.com/free-code-camp-shirt-eu" target="_blank") Also ships from Europe
+                            | .
+                        a.button.btn.btn-block.signup-btn(href="https://teespring.com/get-free-code-camp-t-shirt" target="_blank") Get yours
+                        .button-spacer
+                        #hideTshirtNoticeButton.button.btn.btn-block.btn-info Hide this
+                        .spacer
                 .row
                     .col-xs-12.col-sm-8.col-sm-offset-2
                         h3 800 Hours of Practice:
@@ -140,21 +122,15 @@ block content
     script.
         var username = !{JSON.stringify(user && user.username || '')};
         var lastCompleted = !{JSON.stringify(lastCompleted || false)}
-    // #announcementModal.modal(tabindex='-1')
-    //    .modal-dialog.animated.fadeInUp.fast-animation
-    //        .modal-content
-    //            .modal-header.challenge-list-header Add us to your LinkedIn profile
-    //                a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
-    //            .modal-body
-    //                h3.text-left LinkedIn now recognizes Free Code Camp as a university.
-    //                img.img-responsive.img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png')
-    //                h3.text-left It takes less than a minute to add Free Code Camp to your LinkedIn profile.
-    //                a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/linkedin', target='_blank') Show me how to do this
-    //                a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up
-    //script.
-    //    $(document).ready(function () {
-    //        if (!localStorage || !localStorage.linkedIn) {
-    //            $('#announcementModal').modal('show');
-    //            localStorage.linkedIn = "true";
-    //        }
-    //    });
+        $(document).ready(function () {
+            if (!localStorage || !localStorage.hideTshirtNotice) {
+                $("#tshirt-notice").removeClass("hidden");
+            }
+            $("#hideTshirtNoticeButton").on("click", function() {
+                $("#tshirt-notice").addClass('animated fadeOut');
+                setTimeout(function() {
+                    $("#tshirt-notice").hide();
+                }, 1000);
+                localStorage.hideTshirtNotice = "true";
+            });
+        });

From a1b574f768957d07310686b9eeb494436d2d13ab Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 6 Oct 2015 23:11:37 -0700
Subject: [PATCH 036/140] update camper portfolio page

---
 server/views/account/show.jade | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index e48c80eff9..d3737e3160 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -5,38 +5,38 @@ block content
         var challengeName = 'Profile View';
     if (user && user.username === username)
         .panel.panel-info
-            .panel-heading.text-center Update Your Portfolio
+            .panel-heading.text-center Update your code portfolio
             .panel-body
                 .row
                     .col-xs-12
                         if (!user.isGithubCool)
                             a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
                                 i.fa.fa-github
-                                | Link my GitHub to unlock this profile
+                                | Link my GitHub to unlock my portfolio
                         else
                             a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
                                 i.fa.fa-github
-                                | Update my profile from GitHub
+                                | Update my portfolio from GitHub
                             if (!user.twitter)
                                 a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter')
                                     i.fa.fa-twitter
-                                    | Add my Twitter to my profile
+                                    | Add my Twitter to my portfolio
                             if (!user.facebook)
                                 a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/link/facebook')
                                     i.fa.fa-facebook
-                                    | Add my Facebook to my profile
+                                    | Add my Facebook to my portfolio
                             if (!user.linkedin)
                                 a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/link/linkedin')
                                     i.fa.fa-linkedin
-                                    | Add my LinkedIn to my profile
+                                    | Add my LinkedIn to my portfolio
                             if (!user.google)
                                 a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/link/google')
                                     i.fa.fa-google-plus
-                                    | Add my Google+ to my profile
+                                    | Add my Google+ to my portfolio
 
     .panel.panel-info
         .panel-heading.text-center
-            h1 #{username}'s portfolio
+            h1 #{username}'s code portfolio
         .panel-body
             .row
                 .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
@@ -63,10 +63,10 @@ block content
                     if isFullStackCert
                         .button-spacer
                         a.btn.btn-success(href='/' + username + '/full-stack-certification') View My Full Stack Development Certification
-                    if (user && user.username !== username)
-                        a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/leaderboard/add?username=#{username}')
-                            i.fa.fa-plus-square
-                            | Add them to my personal leaderboard
+                    //if (user && user.username !== username)
+                    //    a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/leaderboard/add?username=#{username}')
+                    //        i.fa.fa-plus-square
+                    //        | Add them to my personal leaderboard
 
             .spacer
                 .hidden-xs.hidden-sm.col-md-12
@@ -152,7 +152,7 @@ block content
 
     if (user && user.username === username)
         .panel.panel-info
-            .panel-heading.text-center Manage Your Account
+            .panel-heading.text-center Manage your account
             .panel-body
                 .col-xs-12
                     a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='mailto:team@freecodecamp.com')

From 05c5eb8d2cf3a37c013297fff6befe865a3686e9 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 6 Oct 2015 23:11:56 -0700
Subject: [PATCH 037/140] update challenge sequence and break on boarding into
 two sections

---
 seed/challenges/basic-bonfires.json           |   2 +-
 seed/challenges/basic-javascript.json         |   2 +-
 seed/challenges/basic-ziplines.json           |   2 +-
 seed/challenges/gear-up-for-success.json      | 110 ++++++++++++++++++
 seed/challenges/getting-started.json          |  74 +-----------
 seed/challenges/jquery.json                   |   2 +-
 seed/challenges/json-apis-and-ajax.json       |  23 ----
 ...t-oriented-and-functional-programming.json |   2 +-
 8 files changed, 120 insertions(+), 97 deletions(-)
 create mode 100644 seed/challenges/gear-up-for-success.json
 delete mode 100644 seed/challenges/json-apis-and-ajax.json

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 12da55a771..afebb968ea 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -1,6 +1,6 @@
 {
   "name": "Basic Algorithm Scripting",
-  "order": 7,
+  "order": 8,
   "challenges": [
     {
       "id": "ad7123c8c441eddfaeb5bdef",
diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 82a0430852..68eab0176c 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Basic JavaScript",
-  "order": 5,
+  "order": 6,
   "challenges": [
     {
       "id":"bd7123c9c441eddfaeb4bdef",
diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index cf2ac272f6..59f2c75237 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -1,6 +1,6 @@
 {
   "name": "Basic Front End Development Projects",
-  "order": 8,
+  "order": 9,
   "challenges": [
     {
       "id": "bd7158d8c442eddfbeb5bd1f",
diff --git a/seed/challenges/gear-up-for-success.json b/seed/challenges/gear-up-for-success.json
new file mode 100644
index 0000000000..a9986a4b45
--- /dev/null
+++ b/seed/challenges/gear-up-for-success.json
@@ -0,0 +1,110 @@
+{
+  "name": "Gear up for Success",
+  "order": 4,
+  "challenges": [
+    {
+      "id": "560add65cb82ac38a17513c2",
+      "title": "Browse Camper News",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/nmSiMy1.gif",
+          "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
+          "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
+          ""
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
+    },
+    {
+      "id": "560add65cb82ac38a17513c1",
+      "title": "Reference our Wiki",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/DoOqkNW.gif",
+          "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
+          "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
+          ""
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
+    },
+    {
+      "id": "570add8ccb82ac38a17513c3",
+      "title": "Join our LinkedIn Alumni Network",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/P7qfJXt.gif",
+          "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
+          "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
+          "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
+    },
+    {
+      "id": "560add8ccb81ac38a17513c4",
+      "title": "Commit to a Goal and a Nonprofit",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/P7qfJXt.gif",
+          "A gif showing how you can commit to a goal for your Free Code Camp studies and pledge a monthly donation to a nonprofit to give you external motivation to reach that goal.",
+          "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. give you external motivation in your quest to learn to code, as well as the opportunity to help nonprofits right away. Choose your goal, choose a monthly donation. When you click \"commit\", the nonprofit's donate page will open in a new tab. You can change your committment or stop it at any time.",
+          "http://freecodecamp.com/commit"
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
+    }
+  ]
+}
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index 23b43e6b59..2f347a649a 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -134,51 +134,19 @@
     },
     {
       "id": "560add56cb82ac38a17513c0",
-      "title": "Configure your Public Profile",
+      "title": "Configure your Code Portfolio",
       "challengeSeed": [],
       "description": [
         [
           "http://i.imgur.com/FkEzbto.gif",
-          "A gif showing how you can click your profile image in your upper right hand corner to access the account page and connect GitHub.",
-          "Check out your portfolio page. Click your picture your upper right hand corner. To activate your portfolio page, you'll need to link your GitHub account with Free Code Camp.",
+          "A gif showing how you can click your profile image in your upper right hand corner to your code portfolio and connect GitHub.",
+          "Check out your code portfolio. Click your picture your upper right hand corner. To activate your code portfolio, you'll need to link your GitHub account with Free Code Camp.",
           ""
         ],
         [
           "http://i.imgur.com/WKzEr1q.gif",
-          "A gif showing how you can access your profile page and hover over different days to see how many brownie points you got on those days.",
-          "Your portfolio page shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak.",
-          ""
-        ]
-      ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "",
-      "descriptionEs": [],
-      "namePt": "",
-      "descriptionPt": []
-    },
-    {
-      "id": "560add65cb82ac38a17513c1",
-      "title": "Try our Wiki and Camper News",
-      "challengeSeed": [],
-      "description": [
-        [
-          "http://i.imgur.com/DoOqkNW.gif",
-          "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
-          "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/nmSiMy1.gif",
-          "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
-          "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
+          "A gif showing how you can access your code portfolio and hover over different days to see how many brownie points you got on those days.",
+          "Your code portfolio shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak.",
           ""
         ]
       ],
@@ -228,38 +196,6 @@
       "namePt": "",
       "descriptionPt": []
     },
-    {
-      "id": "560add8ccb82ac38a17513c3",
-      "title": "Join our Alumni Network and Commit to Your Goal",
-      "challengeSeed": [],
-      "description": [
-        [
-          "http://i.imgur.com/P7qfJXt.gif",
-          "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
-          "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
-          "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
-        ],
-        [
-          "",
-          "",
-          "Free Code Camp will always be free. If you want to feel more motivated to earn our certificates faster, we encourage you to instead pledge to donate to a nonprofit each day.",
-          ""
-        ]
-      ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "",
-      "descriptionEs": [],
-      "namePt": "",
-      "descriptionPt": []
-    },
     {
       "id": "560add8ccb82ac38a17513c4",
       "title": "Learn What to Do If You Get Stuck",
diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index 8d3de88c68..6aa103d38c 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -1,6 +1,6 @@
 {
   "name": "jQuery",
-  "order": 4,
+  "order": 5,
   "challenges": [
     {
       "id": "bad87fee1348bd9acdd08826",
diff --git a/seed/challenges/json-apis-and-ajax.json b/seed/challenges/json-apis-and-ajax.json
deleted file mode 100644
index f8e11696b7..0000000000
--- a/seed/challenges/json-apis-and-ajax.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "JSON APIs and Ajax",
-  "order": 10,
-  "challenges": [
-    {
-      "id": "bad88fee1348bd9ae8c08416",
-      "title": "Stand in challenge",
-      "dashedName":  "waypoint-stand-in-challenge",
-      "difficulty": 3.24,
-      "description": [
-        ""
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        ""
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    }
-  ]
-}
diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index 24a6ec4a17..f00086db9c 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -1,6 +1,6 @@
 {
   "name": "Object Oriented and Functional Programming",
-  "order": 6,
+  "order": 7,
   "note": [
     "Methods",
     "Closures",

From f7500c4bb0d5b998d69e4f25eb0647db25e79b11 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 7 Oct 2015 00:44:46 -0700
Subject: [PATCH 038/140] improve style

---
 server/views/commit/directory.jade | 21 ++++++++++-----------
 server/views/commit/index.jade     | 25 +++++++++++++++----------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/server/views/commit/directory.jade b/server/views/commit/directory.jade
index 5ae6aadf4d..2ba3836f30 100644
--- a/server/views/commit/directory.jade
+++ b/server/views/commit/directory.jade
@@ -4,18 +4,17 @@ block content
         .panel-heading.text-center Commit to one of these nonprofits
         .panel-body
             .row
-                .col-xs-12.col-sm-6.col-sm-offset-3
+                .col-xs-12.col-sm-10.col-sm-offset-1
                     for nonprofit in nonprofits
-                        .spacer
-                        .row
+                        .col-xs-12.col-sm-6.col-md-4.story-section
                             .text-center
                                 h2= nonprofit.displayName
-                        .row
-                            .col-xs-12.col-sm-8.col-sm-offset-2
-                                img.img-responsive.img-center(src=nonprofit.imgUrl)
+                                img.testimonial-image.img-responsive.img-center(src=nonprofit.imgUrl)
+                                .button-spacer
+                                a.text-center(href='/commit?nonprofit=#{nonprofit.name}') Commmit to #{nonprofit.displayName}
                                 p= nonprofit.description
-                        .row
-                            .col-xs-12.col-sm-8.col-sm-offset-2
-                                a.text-center.btn.btn-primary.btn-lg.btn-block(href='/commit?nonprofit=#{nonprofit.name}') Go to #{nonprofit.displayName}
-                        .spacer
-
+            .spacer
+            .col-xs-12
+                a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='mailto:team@freecodecamp.com?subject=Supporting%20Nonprofits')
+                    span.ion-email
+                    | Email us about adding your nonprofit here
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 8d7a065f33..fae22ee978 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -2,36 +2,38 @@ extends ../layout
 block content
     .panel.panel-info
         .panel-body
-            h3.text-center Commit to yourself. Commit to a nonprofit.
+            h2.text-center Commit to yourself. Commit to a nonprofit.
             .row
                 .col-xs-12.col-sm-6.col-sm-offset-3
                   p Give yourself external motivation and help nonprofits right away. Pledge a monthly donation to a nonprofit until you’ve earned either your Front End or Full Stack Development Certification.
+
             .row
                 .col-xs-12.col-sm-6.col-sm-offset-3.text-center
-                  h4 Pledge to #{displayName}
-                  .spacer
+                  h3 Pledge to #{displayName}&thinsp;
+                  .button-spacer
                       a(href='#{imgUrl}' data-lightbox='img-enlarge' alt='#{imgAlt}')
                           img.img-responsive(src='#{imgUrl}' alt='#{imgAlt}')
-                      p= description
-                  a(href='/commit/directory') or browse our directory
+                      p.large-p
+                        = description
+                    a(href='/commit/directory') ...or see other nonprofits
             .spacer
             form.form(name='commit')
                 .hidden
                     input(type='text' value='#{name}' name='nonprofit')
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3
-                        h4 Choose your goal:
+                        h3 Choose your goal:
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
                             label.btn.btn-primary.btn-lg.active
                                 input(type='radio' id=frontEndCert value=frontEndCert name='goal' checked="checked")
-                                | Front End Development Certificate (takes about 400 hours)
+                                | Front End Development Certification (takes about 400 hours)
                             label.btn.btn-primary.btn-lg
                                 input(type='radio' id=fullStackCert value=fullStackCert name='goal')
-                                | Full Stack Development Certificate (takes about 800 hours)
+                                | Full Stack Development Certification (takes about 800 hours)
                 .spacer
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3
-                        h4 Choose how much you want to pledge each month:
+                        h3 Choose your monthly pledge:
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
                             label.btn.btn-success
                                 input(type='radio' id='5-dollar-pledge' value='5' name='amount')
@@ -39,6 +41,9 @@ block content
                             label.btn.btn-success.active
                                 input(type='radio' id='10-dollar-pledge' value='10' name='amount' checked="checked")
                                 | $10 per month
+                            label.btn.btn-success.active
+                                input(type='radio' id='25-dollar-pledge' value='25' name='amount' checked="checked")
+                                | $25 per month
                             label.btn.btn-success
                                 input(type='radio' id='50-dollar-pledge' value='50' name='amount')
                                 | $50 per month
@@ -46,7 +51,7 @@ block content
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit (and open donate page)
-                        .button-spacer
+
             if pledge
                 form.row(name='stop-pledge' action='/commit/stop-commitment' method='post')
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center

From adfbdd7f9fa9e57182e4a01b021e33756bb38a4f Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 7 Oct 2015 01:06:36 -0700
Subject: [PATCH 039/140] more style improvements

---
 server/utils/commit-goals.json |  4 ++--
 server/views/account/show.jade |  2 +-
 server/views/commit/index.jade | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/server/utils/commit-goals.json b/server/utils/commit-goals.json
index 8391145e6b..d9f20e47ff 100644
--- a/server/utils/commit-goals.json
+++ b/server/utils/commit-goals.json
@@ -1,4 +1,4 @@
 {
-  "frontEndCert": "front-end-development-certificate",
-  "fullStackCert": "full-stack-development-certificate"
+  "frontEndCert": "Front End Development Certification",
+  "fullStackCert": "Full Stack Development Certification"
 }
diff --git a/server/views/account/show.jade b/server/views/account/show.jade
index 9b11ef7778..e5385a7e72 100644
--- a/server/views/account/show.jade
+++ b/server/views/account/show.jade
@@ -63,7 +63,7 @@ block content
                           h4
                             | This camper has committed to giving $#{pledge.amount} to
                             a(href='#{pledge.donateUrl}?ref=freecodecamp.com' target='_blank')  #{pledge.displayName}
-                            |  each month until they have completed the #{pledge.goal}
+                            |  each month until they have completed their #{pledge.goal}.
                         .spacer
                     if isFrontEndCert
                         a.btn.btn-primary(href='/' + username + '/front-end-certification') View My Front End Development Certification
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index fae22ee978..34c307a39e 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -41,7 +41,7 @@ block content
                             label.btn.btn-success.active
                                 input(type='radio' id='10-dollar-pledge' value='10' name='amount' checked="checked")
                                 | $10 per month
-                            label.btn.btn-success.active
+                            label.btn.btn-success
                                 input(type='radio' id='25-dollar-pledge' value='25' name='amount' checked="checked")
                                 | $25 per month
                             label.btn.btn-success
@@ -55,12 +55,14 @@ block content
             if pledge
                 form.row(name='stop-pledge' action='/commit/stop-commitment' method='post')
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
-                        button.btn.btn-sm.btn-danger(name='submit' type='submit') Stop my pledge
+                        .button-spacer
+                        button.btn.btn-block.btn-danger(name='submit' type='submit') Stop my current pledge
             else
                 .row
-                    h4.col-xs-12.col-sm-6.col-sm-offset-3.text-center
-                        a(href='/') Maybe later
-                .spacer
+                    .col-xs-12.col-sm-6.col-sm-offset-3.text-center
+                        .button-spacer
+                        a.btn.btn-block.btn-default(href='/') Maybe later
+            .spacer
     script.
       $(function() {
         $('#commit-btn-submit').click(function() {

From a906b8f411418f1f47554361a5e8c5926fb9a20e Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 01:14:33 -0700
Subject: [PATCH 040/140] Fix firstChallenge var should point to new first
 challenge

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

diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index c8da8de013..a1a748b402 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -20,7 +20,7 @@ const isDev = process.env.NODE_ENV !== 'production';
 const isBeta = !!process.env.BETA;
 const debug = debugFactory('freecc:challenges');
 const challengesRegex = /^(bonfire|waypoint|zipline|basejump)/i;
-const firstChallenge = 'waypoint-say-hello-to-html-elements';
+const firstChallenge = 'waypoint-learn-how-free-code-camp-works';
 const challengeView = {
   0: 'coursewares/showHTML',
   1: 'coursewares/showJS',

From 087cfcece7ee509e6aaafe35d804efcbb2a22d48 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 7 Oct 2015 01:26:54 -0700
Subject: [PATCH 041/140] reverse unnecessary changes

---
 seed/challenges/basejumps.json       | 130 ---------------------------
 seed/challenges/getting-started.json |  72 ++++++++++++++-
 2 files changed, 71 insertions(+), 131 deletions(-)

diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index d003b1b5bd..c0dc0a0ba3 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -2,136 +2,6 @@
   "name": "Full Stack JavaScript Projects",
   "order": 20,
   "challenges": [
-    {
-      "id": "560add65cb82ac38a17513c1",
-      "title": "",
-      "challengeSeed": [],
-      "description": [
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "Create an app from this github url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
-          ""
-        ],
-        [
-          "",
-          "",
-          "Create a new GitHub app.",
-          "https://github.com/settings/applications/new"
-        ],
-        [
-          "",
-          "",
-          "Return to c9.io, click the gear and click \"Show Hidden Files\"",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ],
-        [
-          "",
-          "",
-          "",
-          ""
-        ]
-      ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "",
-      "descriptionEs": [],
-      "namePt": "",
-      "descriptionPt": []
-    },
-
-
     {
       "id": "bd7158d8c443eddfaeb5bcef",
       "title": "Get Set for Basejumps",
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index bd4a752c84..dfc2cec3ff 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -164,6 +164,70 @@
       "namePt": "",
       "descriptionPt": []
     },
+    {
+      "id": "560add65cb82ac38a17513c1",
+      "title": "Try our Wiki and Camper News",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/DoOqkNW.gif",
+          "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
+          "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/nmSiMy1.gif",
+          "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
+          "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
+          ""
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
+    },
+    {
+      "id": "560add65cb82ac38a17513c1",
+      "title": "Try our Wiki and Camper News",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/DoOqkNW.gif",
+          "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
+          "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/nmSiMy1.gif",
+          "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
+          "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
+          ""
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
+    },
     {
       "id": "560add71cb82ac38a17513c2",
       "title": "Join a Campsite in Your City",
@@ -198,7 +262,7 @@
     },
     {
       "id": "560add8ccb82ac38a17513c3",
-      "title": "Join our Alumni Network on LinkedIn",
+      "title": "Join our Alumni Network and Commit to Your Goal",
       "challengeSeed": [],
       "description": [
         [
@@ -206,6 +270,12 @@
           "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
           "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
           "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
+        ],
+        [
+          "",
+          "",
+          "Free Code Camp will always be free. If you want to feel more motivated to earn our certificates faster, we encourage you to instead donate each month to a nonprofit.",
+          ""
         ]
       ],
       "type": "Waypoint",

From 39d961fa981e8d14cc1985039f03f84b84de59cc Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 7 Oct 2015 01:40:11 -0700
Subject: [PATCH 042/140] add new gif images and improve step view

---
 seed/challenges/gear-up-for-success.json |  8 +++---
 seed/challenges/getting-started.json     | 32 ------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/seed/challenges/gear-up-for-success.json b/seed/challenges/gear-up-for-success.json
index a9986a4b45..d11fdecf6e 100644
--- a/seed/challenges/gear-up-for-success.json
+++ b/seed/challenges/gear-up-for-success.json
@@ -8,7 +8,7 @@
       "challengeSeed": [],
       "description": [
         [
-          "http://i.imgur.com/nmSiMy1.gif",
+          "http://i.imgur.com/YNwsMXM.gif",
           "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
           "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
           ""
@@ -34,7 +34,7 @@
       "challengeSeed": [],
       "description": [
         [
-          "http://i.imgur.com/DoOqkNW.gif",
+          "http://i.imgur.com/4GO4zcI.gif",
           "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
           "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
           ""
@@ -86,10 +86,10 @@
       "challengeSeed": [],
       "description": [
         [
-          "http://i.imgur.com/P7qfJXt.gif",
+          "http://i.imgur.com/Og1ifsn.gif",
           "A gif showing how you can commit to a goal for your Free Code Camp studies and pledge a monthly donation to a nonprofit to give you external motivation to reach that goal.",
           "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. give you external motivation in your quest to learn to code, as well as the opportunity to help nonprofits right away. Choose your goal, choose a monthly donation. When you click \"commit\", the nonprofit's donate page will open in a new tab. You can change your committment or stop it at any time.",
-          "http://freecodecamp.com/commit"
+          "/commit"
         ]
       ],
       "type": "Waypoint",
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index 1e750177d4..cfdca8f1fe 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -164,38 +164,6 @@
       "namePt": "",
       "descriptionPt": []
     },
-    {
-      "id": "560add65cb82ac38a17513c1",
-      "title": "Try our Wiki and Camper News",
-      "challengeSeed": [],
-      "description": [
-        [
-          "http://i.imgur.com/DoOqkNW.gif",
-          "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
-          "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/nmSiMy1.gif",
-          "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
-          "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
-          ""
-        ]
-      ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "",
-      "descriptionEs": [],
-      "namePt": "",
-      "descriptionPt": []
-    },
     {
       "id": "560add71cb82ac38a17513c2",
       "title": "Join a Campsite in Your City",

From f2679810a9c59cab4a53b3c77c3525395aadff53 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 02:11:23 -0700
Subject: [PATCH 043/140] fix some typos in commit and getting started

---
 seed/challenges/getting-started.json | 2 +-
 server/boot/commit.js                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index cfdca8f1fe..8f8b559eb7 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -140,7 +140,7 @@
         [
           "http://i.imgur.com/FkEzbto.gif",
           "A gif showing how you can click your profile image in your upper right hand corner to your code portfolio and connect GitHub.",
-          "Check out your code portfolio. Click your picture your upper right hand corner. To activate your code portfolio, you'll need to link your GitHub account with Free Code Camp.",
+          "Check out your code portfolio. Click your picture in your upper right hand corner. To activate your code portfolio, you'll need to link your GitHub account with Free Code Camp.",
           ""
         ],
         [
diff --git a/server/boot/commit.js b/server/boot/commit.js
index 9a48ea5236..4ba0f3801e 100644
--- a/server/boot/commit.js
+++ b/server/boot/commit.js
@@ -158,11 +158,11 @@ export default function commit(app) {
         return saveInstance(pledge);
       })
       .subscribe(
-        ({ nonprofit, goal, amount }) => {
+        ({ displayName, goal, amount }) => {
           req.flash('success', {
             msg: dedent`
               Congratulations, you have committed to giving
-              ${nonprofit} $${amount} each month until you have completed
+              ${displayName} $${amount} each month until you have completed
               your ${goal}.
             `
           });

From c6914fa2051c7c05a1a75e1ea066f6d392871796 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 02:22:04 -0700
Subject: [PATCH 044/140] Fix small typo on certification challenge

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

diff --git a/server/boot/certificate.js b/server/boot/certificate.js
index 400d756bcc..c35e97127b 100644
--- a/server/boot/certificate.js
+++ b/server/boot/certificate.js
@@ -145,8 +145,8 @@ export default function certificate(app) {
           }
           return res.status(200).send(
             dedent`
-              Looks like you have not completed the neccessary steps,
-              Please return the map
+              Looks like you have not completed the neccessary steps.
+              Please return to the challenge map.
             `
           );
         },

From 066b2ac7f97f5c664c54a7da5ea37b09a8133be9 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 7 Oct 2015 02:35:23 -0700
Subject: [PATCH 045/140] fix learn button

---
 server/views/partials/navbar.jade | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 6a51f98145..7108bd05b4 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -27,3 +27,19 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
                 .hidden-xs.hidden-sm
                     a(href='/' + user.username)
                         img.profile-picture.float-right(src='#{user.picture}')
+script.
+    $(document).ready(function() {
+        $('.learn-btn').click(function(e) {
+            var challengeDashedName = null;
+            e.preventDefault();
+            if (typeof dashedName === "string") {
+                return location.reload();
+            }
+            if (typeof localStorage !== 'undefined') {
+                challengeDashedName = localStorage.getItem('currentDashedName');
+            }
+            window.location = challengeDashedName ?
+            '/challenges/' + challengeDashedName :
+                    '/map';
+        });
+    });

From 0cb8c6c58bcce807e5c3d9afdf9c270a75d128ee Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 06:05:33 -0700
Subject: [PATCH 046/140] hot patch/ prevent dedube

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

diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index a1a748b402..3b973cc0ac 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -49,12 +49,12 @@ function updateUserProgress(user, challengeId, completedChallenge) {
   let { completedChallenges } = user;
 
   // migrate user challenges object to remove
-  if (!user.isUniqMigrated) {
+  /* if (!user.isUniqMigrated) {
     user.isUniqMigrated = true;
 
     completedChallenges = user.completedChallenges =
       makeChallengesUnique(completedChallenges);
-  }
+  }*/
 
   const indexOfChallenge = _.findIndex(completedChallenges, {
     id: challengeId

From 98d151a5911bd00b9c5bb72c74a9a9e85411ad8e Mon Sep 17 00:00:00 2001
From: Braden Whited <braden.whited@gmail.com>
Date: Wed, 7 Oct 2015 14:54:39 -0400
Subject: [PATCH 047/140] change step 46 heroku addons:create mongolab to
 heroku addons:add mongolab #2039

Changed addons:create to addons:add
---
 seed/challenges/basejumps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index c0dc0a0ba3..b665d28622 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -52,7 +52,7 @@
         "Before you publish to Heroku, you should free up as much memory as possible on Cloud9. In each of the Cloud9 terminal prompt tabs where MongoDB and Grunt are running, press the <code>control + c</code> hotkey to shut down these processes.",
         "Run the following command in a Cloud9 terminal prompt tab: <code>npm install grunt-contrib-imagemin --save-dev && npm install --save-dev && heroku login</code>. At this point, the terminal will prompt you to log in to Heroku from the command line.",
         "Now run <code>yo angular-fullstack:heroku</code>. You can choose a name for your Heroku project, or Heroku will create a random one for you. You can choose whether you want to deploy to servers the US or the EU.",
-        "Set the config flag for your Heroku environment and add MongoLab for your MongoDB instance by running the following command: <code>cd ~/workspace/dist && heroku config:set NODE_ENV=production && heroku addons:create mongolab</code>.",
+        "Set the config flag for your Heroku environment and add MongoLab for your MongoDB instance by running the following command: <code>cd ~/workspace/dist && heroku config:set NODE_ENV=production && heroku addons:add mongolab</code>.",
         "As you build your app, you should frequently commit changes to your codebase. Make sure you're in the <code>~/workspace</code> directory by running <code>cd ~/workspace</code>. Then you can use this code to stage the changes to your changes and commit them: <code>git commit -am \"your commit message\"</code>. Note that you should replace \"your commit message\" with a short summary of the changes you made to your code, such as \"added a records controller and corresponding routes\".",
         "You can push these new commits to GitHub by running <code>git push origin master</code>, and to Heroku by running <code>grunt --force && grunt buildcontrol:heroku</code>.",
         "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out: <a href='https://github.com/clnhll/guidetobasejumps' target='_blank'>https://github.com/clnhll/guidetobasejumps</a>.",

From 155f9359a16769ecb4d10e73a840cc383b81fb95 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 14:37:48 -0700
Subject: [PATCH 048/140] Fix default dollar amount incorrectly set

---
 server/views/commit/index.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index 34c307a39e..cd64379443 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -42,7 +42,7 @@ block content
                                 input(type='radio' id='10-dollar-pledge' value='10' name='amount' checked="checked")
                                 | $10 per month
                             label.btn.btn-success
-                                input(type='radio' id='25-dollar-pledge' value='25' name='amount' checked="checked")
+                                input(type='radio' id='25-dollar-pledge' value='25' name='amount')
                                 | $25 per month
                             label.btn.btn-success
                                 input(type='radio' id='50-dollar-pledge' value='50' name='amount')

From 113c9a297bb3b94ae63ae30dcdb23f83aea3f6d3 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 16:13:07 -0700
Subject: [PATCH 049/140] Fix form action attr throwing xss errors

This PR fixes codeURI xss errors in chrome due to action
attribute.
---
 client/commonFramework.js | 61 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index 4311f7d1ff..3411550978 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -37,6 +37,18 @@ var common = (function() {
       .replace(/fcces/gi, '</script>');
   };
 
+  common.replaceFormActionAttr = function replaceFormAction(value) {
+    return value.replace(/<form.*?>/, function(val) {
+      return val.replace('action=', 'fccfaa=');
+    });
+  };
+
+  common.replaceFccfaaAttr = function replaceFccfaaAttr(value) {
+    return value.replace(/<form.*?>/, function(val) {
+      return val.replace('fccfaa=', 'action=');
+    });
+  };
+
   return common;
 })();
 
@@ -44,6 +56,17 @@ var common = (function() {
 common.codeUri = (function(common, encode, decode, location, history) {
   var replaceScriptTags = common.replaceScriptTags;
   var replaceSafeTags = common.replaceSafeTags;
+  var replaceFormActionAttr = common.replaceFormActionAttr;
+  var replaceFccfaaAttr = common.replaceFccfaaAttr;
+
+  function encodeFcc(val) {
+    return replaceScriptTags(replaceFormActionAttr(val));
+  }
+
+  function decodeFcc(val) {
+    return replaceSafeTags(replaceFccfaaAttr(val));
+  }
+
   var codeUri = {
     encode: function(code) {
       return encode(code);
@@ -72,10 +95,14 @@ common.codeUri = (function(common, encode, decode, location, history) {
         }, false);
     },
     isAlive: function() {
-      return codeUri.isInQuery(location.search) ||
+      return codeUri.enabled &&
+        codeUri.isInQuery(location.search) ||
         codeUri.isInQuery(location.hash);
     },
     parse: function() {
+      if (!codeUri.enabled) {
+        return null;
+      }
       var query;
       if (location.search && codeUri.isInQuery(location.search)) {
         query = location.search.replace(/^\?/, '');
@@ -85,7 +112,7 @@ common.codeUri = (function(common, encode, decode, location, history) {
             null,
             location.href.split('?')[0]
           );
-          location.hash = '#?' + replaceScriptTags(query);
+          location.hash = '#?' + encodeFcc(query);
         }
       } else {
         query = location.hash.replace(/^\#\?/, '');
@@ -100,17 +127,21 @@ common.codeUri = (function(common, encode, decode, location, history) {
           var key = param.split('=')[0];
           var value = param.split('=')[1];
           if (key === 'solution') {
-            return replaceSafeTags(codeUri.decode(value || ''));
+            return decodeFcc(codeUri.decode(value || ''));
           }
           return solution;
         }, null);
     },
     querify: function(solution) {
+      if (!codeUri.enabled) {
+        return null;
+      }
       location.hash = '?solution=' +
-        codeUri.encode(replaceScriptTags(solution));
+        codeUri.encode(encodeFcc(solution));
 
       return solution;
-    }
+    },
+    enabled: true
   };
 
   common.init.push(function() {
@@ -459,6 +490,7 @@ function workerError(error) {
   var housing = $('#testSuite');
   if (display.html() !== error) {
     display.remove();
+
     housing.prepend(
       '<div class="runTimeError" style="font-size: 18px;"><code>' +
       error.replace(/j\$/gi, '$').replace(/jdocument/gi, 'document').replace(/jjQuery/gi, 'jQuery') +
@@ -485,7 +517,10 @@ function safeHTMLRun(test) {
   var codeStorage = common.codeStorage;
   if (common.challengeType === '0') {
     var previewFrame = document.getElementById('preview');
-    var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
+
+    var preview = previewFrame.contentDocument ||
+      previewFrame.contentWindow.document;
+
     if (editor.getValue().match(/\<script\>/gi) !== null) {
       var s = editor
         .getValue()
@@ -554,9 +589,11 @@ function updatePreview() {
 
 if (typeof prodOrDev !== 'undefined') {
 
-  var nodeEnv = prodOrDev === 'production' ?
+  /* eslint-disable no-unused-vars */
+  var nodeEnv = window.prodOrDev === 'production' ?
     'http://www.freecodecamp.com' :
     'http://localhost:3001';
+  /* eslint-enable no-unused-vars */
 
   if (common.challengeType === '0') {
     setTimeout(updatePreview, 300);
@@ -567,8 +604,11 @@ if (typeof prodOrDev !== 'undefined') {
  * "post" methods
  */
 
+/* eslint-disable no-unused-vars */
 var testResults = [];
 var postSuccess = function(data) {
+/* eslint-enable no-unused-vars */
+
   var testDoc = document.createElement('div');
   $(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'>" +
@@ -614,7 +654,9 @@ function showCompletion() {
     isInitRun = false;
     return;
   }
-  var time = Math.floor(Date.now()) - started;
+
+  var time = Math.floor(Date.now()) - window.started;
+
   ga(
     'send',
     'event',
@@ -672,7 +714,10 @@ function showCompletion() {
   });
 }
 
+/* eslint-disable no-unused-vars */
 var resetEditor = function resetEditor() {
+/* eslint-enable no-unused-vars */
+
   editor.setValue(common.replaceSafeTags(common.seed));
   $('#testSuite').empty();
   bonfireExecute(true);

From 1695a760efe9983fe155b629ae38f4f548de7e01 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 7 Oct 2015 16:30:51 -0700
Subject: [PATCH 050/140] Fix check for _id as well as id during certification

---
 server/boot/certificate.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/boot/certificate.js b/server/boot/certificate.js
index c35e97127b..2e106b5d8c 100644
--- a/server/boot/certificate.js
+++ b/server/boot/certificate.js
@@ -31,7 +31,11 @@ function isCertified(frontEndIds, { completedChallenges, isFrontEndCert }) {
   if (isFrontEndCert) {
     return true;
   }
-  return _.every(frontEndIds, ({ id }) => _.some(completedChallenges, { id }));
+  return _.every(frontEndIds, ({ id }) => {
+    return _.some(completedChallenges, (challenge) => {
+      return challenge.id === id || challenge._id === id;
+    });
+  });
 }
 
 export default function certificate(app) {

From f5ed9dbb3bb0711dab3fb381284d7a906af2eb26 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 7 Oct 2015 18:33:01 -0700
Subject: [PATCH 051/140] fix message on slot machine challenge

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

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 68eab0176c..7c87c6a530 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1127,10 +1127,10 @@
         "<code>Math.floor(Math.random() * (3 - 1 + 1)) + 1;</code>"
       ],
       "tests":[
-        "assert(typeof(runSlots($(\".slot\"))[0]) === \"number\", 'message: <code>slotOne</code> should be a random number.')",
-        "assert(typeof(runSlots($(\".slot\"))[1]) === \"number\", 'message: <code>slotTwo</code> should be a random number.')",
-        "assert(typeof(runSlots($(\".slot\"))[2]) === \"number\", 'message: <code>slotThree</code> should be a random number.')",
-        "assert((function(){if(editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi) !== null){return editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi).length >= 3;}else{return false;}})(), 'message: You should have used <code>Math.floor(Math.random() * (3 - 1 + 1)) + 1;</code> three times to generate your random numbers.')"
+        "assert(typeof(runSlots($(\".slot\"))[0]) === \"number\", '<code>slotOne</code> should be a random number.')",
+        "assert(typeof(runSlots($(\".slot\"))[1]) === \"number\", '<code>slotTwo</code> should be a random number.')",
+        "assert(typeof(runSlots($(\".slot\"))[2]) === \"number\", '<code>slotThree</code> should be a random number.')",
+        "assert((function(){if(editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi) !== null){return editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi).length >= 3;}else{return false;}})(), 'You should have used <code>Math.floor(Math.random() * (3 - 1 + 1)) + 1;</code> three times to generate your random numbers.')"
       ],
       "challengeSeed":[
         "fccss",

From 59b76330db6b25cbea9c871699171be180415f39 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Wed, 7 Oct 2015 22:26:09 -0700
Subject: [PATCH 052/140] Fix BF Arguments Optional Links

Swapped out link to Function Objects for link to Closures
---
 seed/challenges/intermediate-bonfires.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index cc15964181..4dee86a7a2 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -823,7 +823,7 @@
         "assert.isUndefined(add(2)([3]), 'message: <code>add(2)([3])</code> should return undefined.');"
       ],
       "MDNlinks": [
-        "Global Function Object",
+        "Closures",
         "Arguments object"
       ],
       "type": "bonfire",

From 76618efcd0f89ca2e29d0cb7d06cd4582f6b2f5d Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 8 Oct 2015 08:12:48 -0700
Subject: [PATCH 053/140] Remove unused jobs-form endpoint

---
 server/boot/randomAPIs.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index c9f3a54f0e..f15cbde478 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -29,7 +29,6 @@ module.exports = function(app) {
   router.get('/nonprofits', nonprofits);
   router.get('/nonprofits-form', nonprofitsForm);
   router.get('/our-sponsors', sponsors);
-  router.get('/jobs-form', jobsForm);
   router.get('/unsubscribe/:email', unsubscribe);
   router.get('/unsubscribed', unsubscribed);
   router.get('/get-started', getStarted);
@@ -208,13 +207,6 @@ module.exports = function(app) {
     });
   }
 
-  function jobsForm(req, res) {
-    res.render('resources/jobs-form', {
-      title: 'Employer Partnership Form for Job Postings,' +
-        ' Recruitment and Corporate Sponsorships'
-    });
-  }
-
   function sponsors(req, res) {
     res.render('sponsors/sponsors', {
       title: 'The Sponsors who make Free Code Camp Possible'

From ad9e16c6d7bae366b42bfbe3b7a27752807b4025 Mon Sep 17 00:00:00 2001
From: ahstro <anton@lutic.org>
Date: Fri, 2 Oct 2015 11:46:17 +0200
Subject: [PATCH 054/140] Make a Person: Add tests for .set*Name methods

Add tests for `bob.setFirstName()`, `bob.setLastName()` and
`bob.setFullName()`.
---
 seed/challenges/upper-intermediate-bonfires.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/seed/challenges/upper-intermediate-bonfires.json b/seed/challenges/upper-intermediate-bonfires.json
index b1ddbc2ac1..24b1dd0115 100644
--- a/seed/challenges/upper-intermediate-bonfires.json
+++ b/seed/challenges/upper-intermediate-bonfires.json
@@ -27,7 +27,12 @@
         "assert.deepEqual(bob.lastName, undefined, 'message: <code>bob.lastName</code> should return undefined.');",
         "assert.deepEqual(bob.getFirstName(), 'Bob', 'message: <code>bob.getFirstName()</code> should return \"Bob\".');",
         "assert.deepEqual(bob.getLastName(), 'Ross', 'message: <code>bob.getLastName()</code> should return \"Ross\".');",
-        "assert.deepEqual(bob.getFullName(), 'Bob Ross', 'message: <code>bob.getFullName()</code> should return \"Bob Ross\".');"
+        "assert.deepEqual(bob.getFullName(), 'Bob Ross', 'message: <code>bob.getFullName()</code> should return \"Bob Ross\".');",
+        "assert.strictEqual((function () { bob.setFirstName(\"Haskell\"); return bob.getFullName(); })(), 'Haskell Ross', 'message: <code>bob.getFullName()</code> should return \"Haskell Ross\" after <code>bob.setFirstName(\"Haskell\")</code>.');",
+        "assert.strictEqual((function () { bob.setLastName(\"Curry\"); return bob.getFullName(); })(), 'Bob Curry', 'message: <code>bob.getFullName()</code> should return \"Bob Curry\" after <code>bob.setLastName(\"Curry\")</code>.');",
+        "assert.strictEqual((function () { bob.setFullName(\"Haskell Curry\"); return bob.getFullName(); })(), 'Haskell Curry', 'message: <code>bob.getFullName()</code> should return \"Haskell Curry\" after <code>bob.setFullName(\"Haskell Curry\")</code>.');",
+        "assert.strictEqual((function () { bob.setFullName(\"Haskell Curry\"); return bob.getFirstName(); })(), 'Haskell', 'message: <code>bob.getFirstName()</code> should return \"Haskell\" after <code>bob.setFullName(\"Haskell Curry\")</code>.');",
+        "assert.strictEqual((function () { bob.setFullName(\"Haskell Curry\"); return bob.getLastName(); })(), 'Curry', 'message: <code>bob.getLastName()</code> should return \"Curry\" after <code>bob.setFullName(\"Haskell Curry\")</code>.');"
       ],
       "MDNlinks": [
         "Closures",

From c2a511cb8666fa06acc5bff9f19a12782e01277a Mon Sep 17 00:00:00 2001
From: ahstro <anton@lutic.org>
Date: Thu, 8 Oct 2015 17:32:06 +0200
Subject: [PATCH 055/140] Seek and Destory: Remove problematic argument

Remove an empty string passed as an argument to `destroy()`. This
argument, being the last, caused people to think their code worked
correctly when it, in fact, worked correctly on all arguments except the
last one.
---
 seed/challenges/basic-bonfires.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index afebb968ea..2c22329088 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -568,7 +568,7 @@
         "  return arr;",
         "}",
         "",
-        "destroyer([1, 2, 3, 1, 2, 3], 2, 3, \"\");"
+        "destroyer([1, 2, 3, 1, 2, 3], 2, 3);"
       ],
       "tests": [
         "assert.deepEqual(destroyer([1, 2, 3, 1, 2, 3], 2, 3), [1, 1], 'message: <code>destroyer([1, 2, 3, 1, 2, 3], 2, 3)</code> should return <code>[1, 1]</code>.');",

From ba88def0359c86bf42237a3729405bcde7a47bd9 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 8 Oct 2015 08:48:52 -0700
Subject: [PATCH 056/140] Harden showCert against errors

---
 server/boot/user.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/boot/user.js b/server/boot/user.js
index f266fa6f12..9e6402b207 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -319,11 +319,12 @@ module.exports = function(app) {
             showFront && user.isFrontEndCert ||
             !showFront && user.isFullStackCert
           ) {
-            var { completedDate } = _.find(user.completedChallenges, {
-              id: showFront ?
-                frontEndChallangeId :
-                fullStackChallangeId
-            });
+            var { completedDate = new Date() } =
+              _.find(user.completedChallenges, {
+                id: showFront ?
+                  frontEndChallangeId :
+                  fullStackChallangeId
+              }) || {};
 
             return res.render(
               showFront ?
@@ -342,7 +343,7 @@ module.exports = function(app) {
               `Looks like user ${username} is not Front End certified` :
               `Looks like user ${username} is not Full Stack certified`
           });
-          res.redirect('/map');
+          res.redirect('back');
         },
         next
       );

From 0dc35f2b0a0e3cd7b2da5afca547b23f9893b336 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 8 Oct 2015 09:02:35 -0700
Subject: [PATCH 057/140] Fix show certs to anon user

closes #3648
---
 server/boot/user.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/boot/user.js b/server/boot/user.js
index f266fa6f12..d299a8230f 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -272,8 +272,10 @@ module.exports = function(app) {
           return Observable.just(user);
         }
         return findUserByUsername$(username, {
+          isGithubCool: true,
           isFrontEndCert: true,
           isFullStackCert: true,
+          isHonest: true,
           completedChallenges: true,
           username: true,
           name: true

From f39fca44723971e4b0091d9f0a7b45964ef091b2 Mon Sep 17 00:00:00 2001
From: Braden Whited <braden.whited@gmail.com>
Date: Thu, 8 Oct 2015 17:47:06 -0400
Subject: [PATCH 058/140] Lesson 31 - Javascript Generate random whole numbers
 within a range comment error #1947

Comment needed changed to be more concise.

See #1947
---
 seed/challenges/basic-javascript.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 68eab0176c..8d0cd75ef5 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -939,7 +939,7 @@
         "var min = 0;",
         "var max = 9;",
         "function myFunction() {",
-        "  // Make myFunction return a random number between zero and nine instead of a decimal",
+        "  // Make myFunction return a random number between min and max values instead of a decimal",
         "  // Only change code below this line.",
         "",
         "  return Math.random();",

From 98d36d1aa1551f749c654bbfb14cd5a54d80608a Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Thu, 8 Oct 2015 15:31:52 -0700
Subject: [PATCH 059/140] Fix BF Diff Two Arrays New Test

Closes #1263
---
 seed/challenges/intermediate-bonfires.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index 4dee86a7a2..d237bf6f18 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -65,7 +65,8 @@
         "assert.deepEqual(diff([\"andesite\", \"grass\", \"dirt\", \"dead shrub\"], [\"andesite\", \"grass\", \"dirt\", \"dead shrub\"]), [], 'message: <code>[\"andesite\", \"grass\", \"dirt\", \"dead shrub\"], [\"andesite\", \"grass\", \"dirt\", \"dead shrub\"]</code> should return <code>[]</code>.');",
         "assert.deepEqual(diff([1, 2, 3, 5], [1, 2, 3, 4, 5]), [4], 'message: <code>[1, 2, 3, 5], [1, 2, 3, 4, 5]</code> should return <code>[4]</code>.');",
         "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]), [\"piglet\", 4], 'message: <code>[1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]</code> should return <code>[\"piglet\", 4]</code>.');",
-        "assert.deepEqual(diff([], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]), [\"snuffleupagus\", \"cookie monster\", \"elmo\"], 'message: <code>[], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code> should return <code>[\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code>.');"
+        "assert.deepEqual(diff([], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]), [\"snuffleupagus\", \"cookie monster\", \"elmo\"], 'message: <code>[], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code> should return <code>[\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code>.');",
+        "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: <code>[1, \"calf\", 3, \"piglet\"], [7, \"filly\"]</code> should return <code>[1, \"calf\", 3, \"piglet\", 7, \"filly\"]</code>.');"
       ],
       "MDNlinks": [
         "Comparison Operators",

From 66120a60b8b530228a370312a913f7a4b849e449 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 8 Oct 2015 16:29:43 -0700
Subject: [PATCH 060/140] update look of commit

---
 server/views/commit/index.jade | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index cd64379443..e1f3d915fc 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -22,7 +22,7 @@ block content
                     input(type='text' value='#{name}' name='nonprofit')
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3
-                        h3 Choose your goal:
+                        h3 Step 1: Choose your goal
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
                             label.btn.btn-primary.btn-lg.active
                                 input(type='radio' id=frontEndCert value=frontEndCert name='goal' checked="checked")
@@ -33,7 +33,7 @@ block content
                 .spacer
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3
-                        h3 Choose your monthly pledge:
+                        h3 Step 2: Choose your monthly pledge
                         .btn-group.btn-group-justified(data-toggle='buttons' role='group')
                             label.btn.btn-success
                                 input(type='radio' id='5-dollar-pledge' value='5' name='amount')
@@ -48,9 +48,18 @@ block content
                                 input(type='radio' id='50-dollar-pledge' value='50' name='amount')
                                 | $50 per month
                 .spacer
+                .col-xs-12.col-sm-6.col-sm-offset-3
+                    h3 Step 3: Set up your monthly donation
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
-                        a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit (and open donate page)
+                        a.btn.btn-block.btn-lg.btn-primary(href=donateUrl target='_blank') Open the #{displayName} donation page
+
+                .spacer
+                .col-xs-12.col-sm-6.col-sm-offset-3
+                    h3 Step 4: Confirm your commitment to your goal
+                .row
+                    .col-xs-12.col-sm-6.col-sm-offset-3.text-center
+                        a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit
 
             if pledge
                 form.row(name='stop-pledge' action='/commit/stop-commitment' method='post')
@@ -61,7 +70,7 @@ block content
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         .button-spacer
-                        a.btn.btn-block.btn-default(href='/') Maybe later
+                        a.btn.btn-block.btn-default(href='/map') Maybe later
             .spacer
     script.
       $(function() {

From e62375516bb8aa5a65bb46a912c6d907ad144478 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 8 Oct 2015 17:00:15 -0700
Subject: [PATCH 061/140] Add commit button functionality

---
 server/views/commit/index.jade | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index e1f3d915fc..876eb81362 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -52,28 +52,38 @@ block content
                     h3 Step 3: Set up your monthly donation
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
-                        a.btn.btn-block.btn-lg.btn-primary(href=donateUrl target='_blank') Open the #{displayName} donation page
+                        a#commit-btn-donate.btn.btn-block.btn-lg.btn-primary(href=donateUrl target='_blank') Open the #{displayName} donation page
 
                 .spacer
                 .col-xs-12.col-sm-6.col-sm-offset-3
-                    h3 Step 4: Confirm your commitment to your goal
+                    h3#commit-step4-text.disabled
+                        Step 4: Confirm
+                        span#commit-step4-hidden.disabled  (Do step 3 first)
+                        span#commit-step4-show.hidden  your commitment to your goal
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
-                        a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit
+                        button#commit-btn-submit.btn.btn-block.btn-lg.btn-primary.disabled Commit
 
             if pledge
                 form.row(name='stop-pledge' action='/commit/stop-commitment' method='post')
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         .button-spacer
-                        button.btn.btn-block.btn-danger(name='submit' type='submit') Stop my current pledge
+                        button.btn.btn-block.btn-lg.btn-default(name='submit' type='submit') Stop my current pledge
             else
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         .button-spacer
-                        a.btn.btn-block.btn-default(href='/map') Maybe later
+                        a.btn.btn-block.btn-lg.btn-default(href='/map') Maybe later
             .spacer
     script.
       $(function() {
+        $('#commit-btn-donate').click(function() {
+          $('#commit-btn-submit').removeClass('disabled');
+          $('#commit-step4-text').removeClass('disabled');
+          $('#commit-step4-hidden').hide();
+          $('#commit-step4-show').removeClass('hidden');
+        });
+
         $('#commit-btn-submit').click(function() {
           window.location.href = '/commit/pledge?' + $('form').serialize();
         });

From 6fafbdf441884b5c9c6529778dddf2e16e36b374 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 8 Oct 2015 17:05:42 -0700
Subject: [PATCH 062/140] improve stories view

---
 client/less/main.less               | 2 +-
 server/views/commit/index.jade      | 2 +-
 server/views/resources/stories.jade | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/less/main.less b/client/less/main.less
index 62fdadff4a..0f7b020802 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -491,7 +491,7 @@ thead {
 }
 
 .story-section {
-  min-height: 500px;
+  height: 400px;
 }
 
 .testimonial-copy {
diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade
index e1f3d915fc..9659bd821b 100644
--- a/server/views/commit/index.jade
+++ b/server/views/commit/index.jade
@@ -70,7 +70,7 @@ block content
                 .row
                     .col-xs-12.col-sm-6.col-sm-offset-3.text-center
                         .button-spacer
-                        a.btn.btn-block.btn-default(href='/map') Maybe later
+                        a.btn.btn-block.btn-default.btn-lg(href='/map') Maybe later
             .spacer
     script.
       $(function() {
diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade
index 0d9b21d999..28343283b7 100644
--- a/server/views/resources/stories.jade
+++ b/server/views/resources/stories.jade
@@ -11,8 +11,9 @@ block content
                                 .story-section
                                     a(href=story.linkedin target='_blank')
                                         img.testimonial-image.img-responsive.img-center(src=story.image)
-                                    h3.text-center
-                                        a(href=story.linkedin target='_blank')= story.camper
+                                    h3.text-center= story.camper
+                                        | &nbsp;
+                                        a.fa.fa-linkedin-square.text-primary(title="@#{username}'s LinkedIn Profile", href=story.linkedin, target='_blank')
                                     p.text-justify= story.quote
 
 

From fcd7e096b2bc2ff7f3cbc432a89c86052b1c3aa3 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 8 Oct 2015 17:25:47 -0700
Subject: [PATCH 063/140] Fix alt attribute

---
 server/views/resources/stories.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade
index 28343283b7..ec77f5431e 100644
--- a/server/views/resources/stories.jade
+++ b/server/views/resources/stories.jade
@@ -13,7 +13,7 @@ block content
                                         img.testimonial-image.img-responsive.img-center(src=story.image)
                                     h3.text-center= story.camper
                                         | &nbsp;
-                                        a.fa.fa-linkedin-square.text-primary(title="@#{username}'s LinkedIn Profile", href=story.linkedin, target='_blank')
+                                        a.fa.fa-linkedin-square.text-primary(alt="#{story.camper}'s LinkedIn Profile", href=story.linkedin, target='_blank')
                                     p.text-justify= story.quote
 
 

From 2d0af3da1d786192f5fc347663ae390e8f0d9a4e Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 8 Oct 2015 18:26:06 -0700
Subject: [PATCH 064/140] fix challenge sequence

---
 seed/challenges/basic-ziplines.json        | 1 -
 seed/challenges/intermediate-bonfires.json | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index 59f2c75237..a13e962f7c 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -117,7 +117,6 @@
         "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.",
-        "Note that you can either put your quotes into an array and show them at random, or use an API to get quotes, such as <a href='http://forismatic.com/en/api/'>http://forismatic.com/en/api/</a>.",
         "Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a> if you get stuck.",
         "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 from fellow campers, click this button and paste in a link to your CodePen project. <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:%20PASTE_YOUR_CODEPEN_URL_HERE%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index cc15964181..6fdbea4eff 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -1,6 +1,6 @@
 {
   "name": "Intermediate Algorithm Scripting",
-  "order": 9,
+  "order": 10,
   "challenges": [
     {
       "id": "a3566b1109230028080c9345",

From 363d0b868d5578b09867eff6be9b5667e704babd Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 9 Oct 2015 00:16:30 -0700
Subject: [PATCH 065/140] quick fix copy for npm challenge bug

---
 seed/challenges/nodejs-and-expressjs.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/seed/challenges/nodejs-and-expressjs.json b/seed/challenges/nodejs-and-expressjs.json
index 63b6373489..6eb04629c0 100644
--- a/seed/challenges/nodejs-and-expressjs.json
+++ b/seed/challenges/nodejs-and-expressjs.json
@@ -33,13 +33,7 @@
         "Complete \"Publish\"",
         "Complete \"Version\"",
         "Complete \"Publish Again\"",
-        "Complete \"Dist Tag\"",
-        "Complete \"Dist Tag Removal\"",
-        "Complete \"Outdated\"",
-        "Complete \"Update\"",
-        "Complete \"RM\"",
-        "Complete \"Finale\"",
-        "Once you've completed these steps, move on to our next challenge."
+        "Note Once you've completed these steps, you can skip the rest (which are currently buggy) and move on to our next challenge."
       ],
       "type": "waypoint",
       "challengeType": 2,

From e080ff1811cf5d2fa1faa251e31c4bdef008f154 Mon Sep 17 00:00:00 2001
From: Abhisek Pattnaik <abhisekp@engineer.com>
Date: Fri, 9 Oct 2015 18:05:55 +0530
Subject: [PATCH 066/140] Add tests in Bonfire - Diff Two Arrays

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

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index d237bf6f18..baf02e2500 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -66,7 +66,8 @@
         "assert.deepEqual(diff([1, 2, 3, 5], [1, 2, 3, 4, 5]), [4], 'message: <code>[1, 2, 3, 5], [1, 2, 3, 4, 5]</code> should return <code>[4]</code>.');",
         "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]), [\"piglet\", 4], 'message: <code>[1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]</code> should return <code>[\"piglet\", 4]</code>.');",
         "assert.deepEqual(diff([], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]), [\"snuffleupagus\", \"cookie monster\", \"elmo\"], 'message: <code>[], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code> should return <code>[\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code>.');",
-        "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: <code>[1, \"calf\", 3, \"piglet\"], [7, \"filly\"]</code> should return <code>[1, \"calf\", 3, \"piglet\", 7, \"filly\"]</code>.');"
+        "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: <code>[1, \"calf\", 3, \"piglet\"], [7, \"filly\"]</code> should return <code>[1, \"calf\", 3, \"piglet\", 7, \"filly\"]</code>.');",
+        "assert.deepEqual(diff([1, 2, 3, 3], [1]), [2, 3, 3], 'message: <code>[1, 2, 3, 3], [1]</code> should return <code>[2, 3, 3]</code>.');"
       ],
       "MDNlinks": [
         "Comparison Operators",

From 1d23b28da047ceb78750d3884a36c313ce3e1c2a Mon Sep 17 00:00:00 2001
From: Daniel Robinson <djr.self@gmail.com>
Date: Thu, 8 Oct 2015 19:18:53 -0400
Subject: [PATCH 067/140] Fix typo 'array or numbers' to 'array of numbers'

---
 seed/challenges/object-oriented-and-functional-programming.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index f00086db9c..9527328a4f 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -206,7 +206,7 @@
       "title":"Condense arrays with .reduce",
       "difficulty":0,
       "description":[
-        "Reduce can be useful for condensing an array or numbers into one value.",
+        "Reduce can be useful for condensing an array of numbers into one value.",
         "<code>var singleVal = array.reduce(function(previousVal, currentVal){</code>",
         "<code>&thinsp;&thinsp;return previousVal+currentVal;</code>",
         "<code>});</code>"

From f44b5a3204a2610ccb7ed81aa8bdf51004ee5b02 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Fri, 9 Oct 2015 11:54:56 -0700
Subject: [PATCH 068/140] Fix Waypoint Filter Arrays Test

Test now consistant with instructions
Closes #3671
---
 seed/challenges/object-oriented-and-functional-programming.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index f00086db9c..5423d54d72 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -240,7 +240,7 @@
         "<code>});</code>"
       ],
       "tests":[
-        "assert.deepEqual(array, [1,2,3,4], 'message: You should have removed all the values from the array that are greater than 4.');",
+        "assert.deepEqual(array, [1,2,3,4,5], 'message: You should have removed all the values from the array that are greater than 5.');",
         "assert(editor.getValue().match(/array\\.filter\\s*\\(/gi), 'message: You should be using the filter method to remove the values from the array.');",
         "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7\\,8\\,9\\,10\\]/gi), 'message: You should only be using <code>.filter</code> to modify the contents of the array.');"
       ],

From f7edf7c2b25331650cbd6a8fb0317815334f7725 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Fri, 9 Oct 2015 12:03:13 -0700
Subject: [PATCH 069/140] Fix BF Sum Odd Fibonacci Numbers Test Error Wording

Closes 3660
---
 seed/challenges/intermediate-bonfires.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index d237bf6f18..bd5d831a63 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -512,7 +512,7 @@
         "sumFibs(4);"
       ],
       "tests": [
-        "assert(typeof(sumFibs(1)) === \"number\", 'message: <code>sumFibs()</code> should return a number.');",
+        "assert(typeof(sumFibs(1)) === \"number\", 'message: <code>sumFibs(1)</code> should return a number.');",
         "assert.deepEqual(sumFibs(1000), 1785, 'message: <code>sumFibs(1000)</code> should return 1785.');",
         "assert.deepEqual(sumFibs(4000000), 4613732, 'message: <code>sumFibs(4000000)</code> should return 4613732.');",
         "assert.deepEqual(sumFibs(4), 5, 'message: <code>sumFibs(4)</code> should return 5.');",

From 076fc79fc6bd496fb5c84f9d41b62985efa79f2b Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Fri, 9 Oct 2015 13:13:47 -0700
Subject: [PATCH 070/140] Fix Waypoint Nest Anchor Within Paragraph Test Regex

Tolerates whitespace between opening `<p>` tag and "View more" text
Closes #3675
---
 seed/challenges/html5-and-css.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 3b2f72853e..f4a6cd5d7b 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -1122,7 +1122,7 @@
         "assert($(\"a\").text().match(/cat\\sphotos/gi), 'Your <code>a</code> element should have the anchor text of \"cat photos\"')",
         "assert($(\"p\") && $(\"p\").length > 2, 'Create a new <code>p</code> element around your <code>a</code> element.')",
         "assert($(\"a[href=\\\"http://www.freecatphotoapp.com\\\"]\").parent().is(\"p\"), 'Your <code>a</code> element should be nested within your new <code>p</code> element.')",
-        "assert($(\"p\").text().match(/^View\\smore\\s/gi), 'Your <code>p</code> element should have the text \"View more \" (with a space after it).')",
+        "assert($(\"p\").text().match(/^\\s*View\\smore\\s/gi), 'Your <code>p</code> element should have the text \"View more \" (with a space after it).')",
         "assert(!$(\"a\").text().match(/View\\smore/gi), 'Your <code>a</code> element should <em>not</em> have the text \"View more\".')",
         "assert(editor.match(/<\\/p>/g) && editor.match(/<p/g) && editor.match(/<\\/p>/g).length === editor.match(/<p/g).length, 'Make sure each of your <code>p</code> elements has a closing tag.')",
         "assert(editor.match(/<\\/a>/g) && editor.match(/<a/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure each of your <code>a</code> elements has a closing tag.')"

From c2da02bf8a4f49d3cdb5fa67d2be4838f9d0c976 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 9 Oct 2015 19:33:15 -0700
Subject: [PATCH 071/140] improve copy on button

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

diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index 12eb19abdd..db351b7af8 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -27,7 +27,7 @@ block content
                             | .
                         a.button.btn.btn-block.signup-btn(href="https://teespring.com/get-free-code-camp-t-shirt" target="_blank") Get yours
                         .button-spacer
-                        #hideTshirtNoticeButton.button.btn.btn-block.btn-info Hide this
+                        #hideTshirtNoticeButton.button.btn.btn-block.btn-info Hide this forever
                         .spacer
                 .row
                     .col-xs-12.col-sm-8.col-sm-offset-2

From 66fc4497cfd20d60e0b7281559427bdfbc8d236d Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Sat, 10 Oct 2015 09:17:36 -0700
Subject: [PATCH 072/140] Fix Waypoint Iterate with a For Loop Typo

Closes #3691
---
 seed/challenges/basic-javascript.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 9c9901a304..f9caca1efe 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -802,7 +802,7 @@
         "assert.deepEqual(myArray, [0,1,2,3,4], 'message: <code>myArray</code> should equal [0,1,2,3,4].');"
       ],
       "challengeSeed":[
-        "ourArray = [];",
+        "var ourArray = [];",
         "for(var i = 0; i < 5; i++){",
         "  ourArray.push(i);",
         "}",

From 1627aa522a2db442fe88a71490926dfcc2609de4 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Sat, 10 Oct 2015 11:44:20 -0700
Subject: [PATCH 073/140] Fix form action attribute regex Should ignore
 whitespace and new lines

---
 client/commonFramework.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index 3411550978..4c193c0d36 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -38,14 +38,14 @@ var common = (function() {
   };
 
   common.replaceFormActionAttr = function replaceFormAction(value) {
-    return value.replace(/<form.*?>/, function(val) {
-      return val.replace('action=', 'fccfaa=');
+    return value.replace(/<form[^>]*>/, function(val) {
+      return val.replace(/action(\s*?)=/, 'fccfaa$1=');
     });
   };
 
   common.replaceFccfaaAttr = function replaceFccfaaAttr(value) {
-    return value.replace(/<form.*?>/, function(val) {
-      return val.replace('fccfaa=', 'action=');
+    return value.replace(/<form[^>]*>/, function(val) {
+      return val.replace(/fccfaa(\s*?)=/, 'action$1=');
     });
   };
 

From ea425864be3673fd287be7bd840fb46c07fa44d3 Mon Sep 17 00:00:00 2001
From: SaintPeter <rex.schrader@gmail.com>
Date: Sat, 10 Oct 2015 13:24:15 -0700
Subject: [PATCH 074/140] Remove suprious parameters from early Bonfires

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

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 2c22329088..df9b1b8355 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -60,7 +60,7 @@
         "  return str;",
         "}",
         "",
-        "reverseString(\"hello\", \"\");"
+        "reverseString(\"hello\");"
       ],
       "MDNlinks": [
         "Global String Object",
@@ -103,7 +103,7 @@
         "  return num;",
         "}",
         "",
-        "factorialize(5, '');"
+        "factorialize(5);"
       ],
       "MDNlinks": [
         "Arithmetic Operators"
@@ -224,7 +224,7 @@
         "  return str;",
         "}",
         "",
-        "titleCase(\"I'm a little tea pot\", \"\");"
+        "titleCase(\"I'm a little tea pot\");"
       ],
       "tests": [
         "assert(typeof(titleCase(\"I&#39;m a little tea pot\")) === \"string\", 'message: <code>titleCase()</code> should return a string.');",
@@ -300,7 +300,7 @@
         "  return str;",
         "}",
         "",
-        "end(\"Bastian\", \"n\", \"\");"
+        "end(\"Bastian\", \"n\");"
       ],
       "tests": [
         "assert(end(\"Bastian\", \"n\") === true, 'message: <code>end(\"Bastian\", \"n\")</code> should return true.');",
@@ -338,7 +338,7 @@
         "  return str;",
         "}",
         "",
-        "repeat(\"abc\", 3, \"\");"
+        "repeat(\"abc\", 3);"
       ],
       "tests": [
         "assert(repeat(\"*\", 3) === \"***\", 'message: <code>repeat(\"*\", 3)</code> should return <code>\"***\"</code>.');",
@@ -375,7 +375,7 @@
         "  return str;",
         "}",
         "",
-        "truncate(\"A-tisket a-tasket A green and yellow basket\", 11, \"\");"
+        "truncate(\"A-tisket a-tasket A green and yellow basket\", 11);"
       ],
       "tests": [
         "assert(truncate(\"A-tisket a-tasket A green and yellow basket\", 11) === \"A-tisket...\", 'message: <code>truncate(\"A-tisket a-tasket A green and yellow basket\", 11)</code> should return \"A-tisket...\".');",
@@ -412,7 +412,7 @@
         "  return arr;",
         "}",
         "",
-        "chunk([\"a\", \"b\", \"c\", \"d\"], 2, \"\");"
+        "chunk([\"a\", \"b\", \"c\", \"d\"], 2);"
       ],
       "tests": [
         "assert.deepEqual(chunk([\"a\", \"b\", \"c\", \"d\"], 2), [[\"a\", \"b\"], [\"c\", \"d\"]], 'message: <code>chunk([\"a\", \"b\", \"c\", \"d\"], 2)</code> should return <code>[[\"a\", \"b\"], [\"c\", \"d\"]]</code>.');",
@@ -450,7 +450,7 @@
         "  return arr;",
         "}",
         "",
-        "slasher([1, 2, 3], 2, \"\");"
+        "slasher([1, 2, 3], 2);"
       ],
       "tests": [
         "assert.deepEqual(slasher([1, 2, 3], 2), [3], 'message: <code>slasher([1, 2, 3], 2, [3])</code> should return <code>[3]</code>.');",
@@ -489,7 +489,7 @@
         "  return arr;",
         "}",
         "",
-        "mutation([\"hello\", \"hey\"], \"\");"
+        "mutation([\"hello\", \"hey\"]);"
       ],
       "tests": [
         "assert(mutation([\"hello\", \"hey\"]) === false, 'message: <code>mutation([\"hello\", \"hey\"])</code> should return false.');",
@@ -531,7 +531,7 @@
         "  return arr;",
         "}",
         "",
-        "bouncer([7, \"ate\", \"\", false, 9], \"\");"
+        "bouncer([7, \"ate\", \"\", false, 9]);"
       ],
       "tests": [
         "assert.deepEqual(bouncer([7, \"ate\", \"\", false, 9]), [7, \"ate\", 9], 'message: <code>bouncer([7, \"ate\", \"\", false, 9])</code> should return <code>[7, \"ate\", 9]</code>.');",
@@ -608,7 +608,7 @@
         "  return num;",
         "}",
         "",
-        "where([40, 60], 50, \"\");"
+        "where([40, 60], 50);"
       ],
       "MDNlinks": [
         "Array.sort()"

From 21c78f9f96ec0ba131fb1c06e6128239ff118cfa Mon Sep 17 00:00:00 2001
From: uwaseem <ubaidillah@iflix.com>
Date: Sun, 11 Oct 2015 17:41:27 +0800
Subject: [PATCH 075/140] Removed an extra m from the word commit

---
 server/views/commit/directory.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/views/commit/directory.jade b/server/views/commit/directory.jade
index 2ba3836f30..5133e89116 100644
--- a/server/views/commit/directory.jade
+++ b/server/views/commit/directory.jade
@@ -11,7 +11,7 @@ block content
                                 h2= nonprofit.displayName
                                 img.testimonial-image.img-responsive.img-center(src=nonprofit.imgUrl)
                                 .button-spacer
-                                a.text-center(href='/commit?nonprofit=#{nonprofit.name}') Commmit to #{nonprofit.displayName}
+                                a.text-center(href='/commit?nonprofit=#{nonprofit.name}') Commit to #{nonprofit.displayName}
                                 p= nonprofit.description
             .spacer
             .col-xs-12

From 1e2f42dfe639e6995721de9c643a53c70f3f0cd4 Mon Sep 17 00:00:00 2001
From: Arsen Melikyan <bugron@mail.ru>
Date: Sun, 11 Oct 2015 15:34:14 +0400
Subject: [PATCH 076/140] refactor upper intermediate bonfire tests to use
 asserts

---
 seed/challenges/upper-intermediate-bonfires.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/seed/challenges/upper-intermediate-bonfires.json b/seed/challenges/upper-intermediate-bonfires.json
index b1ddbc2ac1..42f3c67293 100644
--- a/seed/challenges/upper-intermediate-bonfires.json
+++ b/seed/challenges/upper-intermediate-bonfires.json
@@ -105,10 +105,10 @@
       ],
       "tests": [
         "assert.deepEqual(pairwise([1, 4, 2, 3, 0, 5], 7), 11, 'message: <code>pairwise([1, 4, 2, 3, 0, 5], 7)</code> should return 11.');",
-        "expect(pairwise([1, 3, 2, 4], 4), 1, 'message: <code>pairwise([1, 3, 2, 4], 4), 1</code> should return 1.');",
-        "expect(pairwise([1,1,1], 2), 1, 'message: <code>pairwise([1,1,1], 2)</code> should return 1.');",
-        "expect(pairwise([0, 0, 0, 0, 1, 1], 1), 10, 'message: <code>pairwise([0, 0, 0, 0, 1, 1], 1)</code> should return 10.');",
-        "expect(pairwise([], 100), 0, 'message: <code>pairwise([], 100)</code> should return 0.');"
+        "assert.deepEqual(pairwise([1, 3, 2, 4], 4), 1, 'message: <code>pairwise([1, 3, 2, 4], 4), 1</code> should return 1.');",
+        "assert.deepEqual(pairwise([1,1,1], 2), 1, 'message: <code>pairwise([1,1,1], 2)</code> should return 1.');",
+        "assert.deepEqual(pairwise([0, 0, 0, 0, 1, 1], 1), 10, 'message: <code>pairwise([0, 0, 0, 0, 1, 1], 1)</code> should return 10.');",
+        "assert.deepEqual(pairwise([], 100), 0, 'message: <code>pairwise([], 100)</code> should return 0.');"
       ],
       "MDNlinks": [
         "Array.reduce()"

From b3d2a1839929a8e558812c72032d9be89b7851a4 Mon Sep 17 00:00:00 2001
From: natac13 <sean.campbell13@gmail.com>
Date: Sun, 11 Oct 2015 10:07:25 -0400
Subject: [PATCH 077/140] fix boo(NaN) return true to false closes #3701

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

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index ae17999083..810bf00cbf 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -356,7 +356,7 @@
         "assert.strictEqual(boo([].slice), false, 'message: <code>boo([].slice)</code> should return false.');",
         "assert.strictEqual(boo({ \"a\": 1 }), false, 'message: <code>boo({ \"a\": 1 })</code> should return false.');",
         "assert.strictEqual(boo(1), false, 'message: <code>boo(1)</code> should return false.');",
-        "assert.strictEqual(boo(NaN), false, 'message: <code>boo(NaN)</code> should return true.');",
+        "assert.strictEqual(boo(NaN), false, 'message: <code>boo(NaN)</code> should return false.');",
         "assert.strictEqual(boo(\"a\"), false, 'message: <code>boo(\"a\")</code> should return false.');"
       ],
       "MDNlinks": [

From c80caba883a2a05459726dcd18bcff2c099b93a8 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Sun, 11 Oct 2015 10:10:22 -0700
Subject: [PATCH 078/140] Fix BF Slasher Flick Tests

Closes #3687 and adds a case to catch the problematic solution pointed out by @bugron
---
 seed/challenges/basic-bonfires.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index df9b1b8355..7567aaed31 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -453,9 +453,10 @@
         "slasher([1, 2, 3], 2);"
       ],
       "tests": [
-        "assert.deepEqual(slasher([1, 2, 3], 2), [3], 'message: <code>slasher([1, 2, 3], 2, [3])</code> should return <code>[3]</code>.');",
+        "assert.deepEqual(slasher([1, 2, 3], 2), [3], 'message: <code>slasher([1, 2, 3], 2)</code> should return <code>[3]</code>.');",
         "assert.deepEqual(slasher([1, 2, 3], 0), [1, 2, 3], 'message: <code>slasher([1, 2, 3], 0)</code> should return <code>[1, 2, 3]</code>.');",
-        "assert.deepEqual(slasher([1, 2, 3], 9), [], 'message: <code>slasher([1, 2, 3], 9)</code> should return <code>[]</code>.');"
+        "assert.deepEqual(slasher([1, 2, 3], 9), [], 'message: <code>slasher([1, 2, 3], 9)</code> should return <code>[]</code>.');",
+        "assert.deepEqual(slasher([1, 2, 3], 4), [], 'message: <code>slasher([1, 2, 3], 4)</code> should return <code>[]</code>.');"
       ],
       "MDNlinks": [
         "Array.slice()",

From 51012bd121dbc77731ded4d25a696a1536dfa947 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 11 Oct 2015 17:05:28 -0700
Subject: [PATCH 079/140] remove console.log statement

---
 client/commonFramework.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index 4c193c0d36..a28a1e743d 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -453,7 +453,6 @@ var editor = (function(CodeMirror, emmetCodeMirror, common) {
   common.init.push(function() {
     var editorValue;
     if (common.codeUri.isAlive()) {
-      console.log('in query');
       editorValue = common.codeUri.parse();
     } else {
       editorValue = codeStorage.isAlive() ?

From 7b444b15dc96a1f23c6447cff2c64e29db420ff2 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Sun, 11 Oct 2015 15:57:49 -0700
Subject: [PATCH 080/140] Update loopback, ThunderCats and RxJS.

closes #2929
---
 common/app/flux/Store.js                        | 12 ++++++++----
 common/app/routes/Hikes/components/Lecture.jsx  |  6 +++---
 common/app/routes/Hikes/components/Question.jsx | 13 +++++++------
 common/app/routes/Hikes/flux/Actions.js         |  2 +-
 common/app/routes/Hikes/flux/Store.js           | 12 ++++++++----
 common/app/routes/Jobs/flux/Store.js            | 12 ++++++++----
 package.json                                    | 12 ++++++------
 server/boot/challenge.js                        |  4 ++--
 8 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/common/app/flux/Store.js b/common/app/flux/Store.js
index c745e16ac0..30ee4e7ff3 100644
--- a/common/app/flux/Store.js
+++ b/common/app/flux/Store.js
@@ -8,13 +8,17 @@ const initValue = {
   points: 0
 };
 
-export default Store(initValue)
-  .refs({ displayName: 'AppStore' })
-  .init(({ instance: appStore, args: [cat] }) => {
+export default Store({
+  refs: {
+    displayName: 'AppStore',
+    value: initValue
+  },
+  init({ instance: appStore, args: [cat] }) {
     const { setUser, setTitle } = cat.getActions('appActions');
     const register = createRegistrar(appStore);
 
     register(setter(fromMany(setUser, setTitle)));
 
     return appStore;
-  });
+  }
+});
diff --git a/common/app/routes/Hikes/components/Lecture.jsx b/common/app/routes/Hikes/components/Lecture.jsx
index ea3c85191d..e47dc0fc98 100644
--- a/common/app/routes/Hikes/components/Lecture.jsx
+++ b/common/app/routes/Hikes/components/Lecture.jsx
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { Button, Col, Row, Panel } from 'react-bootstrap';
-import { Navigation } from 'react-router';
+import { History } from 'react-router';
 import Vimeo from 'react-vimeo';
 import debugFactory from 'debug';
 
@@ -8,7 +8,7 @@ const debug = debugFactory('freecc:hikes');
 
 export default React.createClass({
   displayName: 'Lecture',
-  mixins: [Navigation],
+  mixins: [History],
 
   propTypes: {
     currentHike: PropTypes.object,
@@ -20,7 +20,7 @@ export default React.createClass({
   handleFinish() {
     debug('loading questions');
     const { dashedName } = this.props.params;
-    this.transitionTo(`/hikes/${dashedName}/questions/1`);
+    this.history.pushState(null, `/hikes/${dashedName}/questions/1`);
   },
 
   renderTranscript(transcript, dashedName) {
diff --git a/common/app/routes/Hikes/components/Question.jsx b/common/app/routes/Hikes/components/Question.jsx
index e7fe7662d9..4f7e97f149 100644
--- a/common/app/routes/Hikes/components/Question.jsx
+++ b/common/app/routes/Hikes/components/Question.jsx
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { Spring } from 'react-motion';
-import { Navigation, TransitionHook } from 'react-router';
+import { History, Lifecycle } from 'react-router';
 import debugFactory from 'debug';
 import {
   Button,
@@ -19,8 +19,8 @@ export default React.createClass({
   displayName: 'Question',
 
   mixins: [
-    Navigation,
-    TransitionHook
+    History,
+    Lifecycle
   ],
 
   propTypes: {
@@ -150,7 +150,8 @@ export default React.createClass({
 
     postJSON$('/completed-challenge', { id, name }).subscribeOnCompleted(() => {
       if (tests[nextQuestionIndex]) {
-        return this.transitionTo(
+        return this.history.pushState(
+          null,
           `/hikes/${ dashedName }/questions/${ nextQuestionIndex + 1 }`
         );
       }
@@ -168,13 +169,13 @@ export default React.createClass({
         }, null);
 
       if (nextHike) {
-        return this.transitionTo(`/hikes/${ nextHike.dashedName }`);
+        return this.history.pushState(null, `/hikes/${ nextHike.dashedName }`);
       }
       debug(
         'next Hike was not found, currentHike %s',
         currentHike.dashedName
       );
-      this.transitionTo('/hikes');
+      this.history.pushState(null, '/hikes');
     });
   },
 
diff --git a/common/app/routes/Hikes/flux/Actions.js b/common/app/routes/Hikes/flux/Actions.js
index 2d9d44a4fd..f6ed407fae 100644
--- a/common/app/routes/Hikes/flux/Actions.js
+++ b/common/app/routes/Hikes/flux/Actions.js
@@ -3,7 +3,7 @@ import debugFactory from 'debug';
 
 const debug = debugFactory('freecc:hikes:actions');
 
-function getCurrentHike(hikes =[{}], dashedName, currentHike) {
+function getCurrentHike(hikes = [{}], dashedName, currentHike) {
   if (!dashedName) {
     debug('no dashedName');
     return hikes[0];
diff --git a/common/app/routes/Hikes/flux/Store.js b/common/app/routes/Hikes/flux/Store.js
index 4c7080b1c2..9755ed679a 100644
--- a/common/app/routes/Hikes/flux/Store.js
+++ b/common/app/routes/Hikes/flux/Store.js
@@ -5,12 +5,16 @@ const initialValue = {
   currentHike: {}
 };
 
-export default Store(initialValue)
-  .refs({ displayName: 'HikesStore'})
-  .init(({ instance: hikeStore, args: [cat] }) => {
+export default Store({
+  refs: {
+    displayName: 'HikesStore',
+    value: initialValue
+  },
+  init({ instance: hikeStore, args: [cat] }) {
 
     let { setHikes } = cat.getActions('hikesActions');
     hikeStore.register(setHikes);
 
     return hikeStore;
-  });
+  }
+});
diff --git a/common/app/routes/Jobs/flux/Store.js b/common/app/routes/Jobs/flux/Store.js
index b2f5132013..8f3acd2949 100644
--- a/common/app/routes/Jobs/flux/Store.js
+++ b/common/app/routes/Jobs/flux/Store.js
@@ -6,9 +6,12 @@ const {
   transformer
 } = Store;
 
-export default Store({ showModal: false })
-  .refs({ displayName: 'JobsStore' })
-  .init(({ instance: jobsStore, args: [cat] }) => {
+export default Store({
+  refs: {
+    displayName: 'JobsStore',
+    value: { showModal: false }
+  },
+  init({ instance: jobsStore, args: [cat] }) {
     const {
       setJobs,
       findJob,
@@ -27,4 +30,5 @@ export default Store({ showModal: false })
 
     register(transformer(findJob));
     register(handleForm);
-  });
+  }
+});
diff --git a/package.json b/package.json
index c3f7c0bebb..06d6a933ce 100644
--- a/package.json
+++ b/package.json
@@ -63,8 +63,8 @@
     "json-loader": "^0.5.2",
     "less": "~2.5.1",
     "lodash": "^3.9.3",
-    "loopback": "https://github.com/FreeCodeCamp/loopback.git#fix/no-password",
-    "loopback-boot": "2.8.2",
+    "loopback": "^2.22.0",
+    "loopback-boot": "^2.13.0",
     "loopback-component-passport": "https://github.com/FreeCodeCamp/loopback-component-passport.git#feature/flashfailure",
     "loopback-connector-mongodb": "^1.10.0",
     "lusca": "~1.0.2",
@@ -89,17 +89,17 @@
     "react": "^0.13.3",
     "react-bootstrap": "~0.23.7",
     "react-motion": "~0.1.0",
-    "react-router": "^1.0.0-rc1",
+    "react-router": "https://github.com/BerkeleyTrue/react-router.git#freecodecamp",
     "react-vimeo": "^0.0.3",
     "request": "~2.53.0",
     "rev-del": "^1.0.5",
-    "rx": "^2.5.3",
+    "rx": "^4.0.0",
     "sanitize-html": "~1.6.1",
     "sort-keys": "^1.1.1",
     "source-map-support": "^0.3.2",
     "store": "https://github.com/berkeleytrue/store.js.git#feature/noop-server",
-    "thundercats": "^2.1.0",
-    "thundercats-react": "^0.1.0",
+    "thundercats": "^3.0.0",
+    "thundercats-react": "^0.3.0",
     "twit": "~1.1.20",
     "uglify-js": "~2.4.15",
     "validator": "^3.22.1",
diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 3b973cc0ac..400c32db33 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -186,7 +186,7 @@ module.exports = function(app) {
               );
             }
             const firstChallengeOfNextBlock$ = blocks$
-              .elementAtOrDefault(blockIndex + 1, {})
+              .elementAt(blockIndex + 1, {})
               .map(({ challenges = [] }) => challenges[0]);
 
             return blocks$
@@ -259,7 +259,7 @@ module.exports = function(app) {
       .filter((challenge) => {
         return testChallengeName.test(challenge.name);
       })
-      .lastOrDefault(null)
+      .last({ defaultValue: null })
       .flatMap(challenge => {
 
         // Handle not found

From 3dee03d38b2f5c86ada85bdc095eb8e4ef311ae7 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Mon, 12 Oct 2015 01:22:11 -0700
Subject: [PATCH 081/140] add more stories and clean up css

---
 client/less/main.less              |   2 +-
 server/resources/testimonials.json | 117 ++++++++++++++++++++++++++---
 2 files changed, 108 insertions(+), 11 deletions(-)

diff --git a/client/less/main.less b/client/less/main.less
index 0f7b020802..00f426e55b 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -491,7 +491,7 @@ thead {
 }
 
 .story-section {
-  height: 400px;
+  height: 500px;
 }
 
 .testimonial-copy {
diff --git a/server/resources/testimonials.json b/server/resources/testimonials.json
index 1f9b560852..a2d0a72622 100644
--- a/server/resources/testimonials.json
+++ b/server/resources/testimonials.json
@@ -8,11 +8,109 @@
   },
   {
     "camper": "Branden Byers",
-    "quote": "Could I have gotten a job without Free Code Camp? Eventually, sure. But Free Code Camp provided a far denser experience than in my roughly 24 previous years of dabbling in tech.",
+    "quote": "My goal was to become employed by the end of 2015. Instead, I ended up with a job at the beginning of 2015. This was directly related to my work at Free Code Camp.",
     "github": "brandenbyers",
     "linkedin": "https://www.linkedin.com/in/brandenbyers",
     "image": "https://pbs.twimg.com/profile_images/539515557184167936/JqJXzV9x.jpeg"
   },
+  {
+    "camper": "Viktor Bakurin",
+    "quote": "During my work on Free Code Camp's nonprofit projects, I found a MEAN stack position outside of my home country. Now I work in Budapest.",
+    "github": "letalumil",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAq6G3QBA1DIwFZGrS4DGqDzBDTzFjrbNQo&authType=NAME_SEARCH&authToken=QoJ0&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A179968884%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635040141%2Ctas%3AViktor%20Bakurin",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAM3AAAAJDVkZThkNjk3LWY4MTgtNGNmMS05MTZkLTkxZDljOGEzMGM5Nw.jpg"
+  },
+  {
+    "camper": "Maxim Orlov",
+    "quote": "Before joining the community I had zero knowledge of web development and 6 months and 3 days later I had landed my first job as a backend engineer for a tech start-up. My career has just started and thanks to Free Code Camp the dream of becoming a prominent figure in the software industry is within reach.",
+    "github": "Maximization",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAo83nwBF57LpD9mZlm5dH6OcovOpYKPs3k&authType=NAME_SEARCH&authToken=yG4h&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A171761276%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635014777%2Ctas%3AMaxim%20Orlov",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAALJAAAAJGI5ZGFhODA0LWI4MzAtNDU5Ny04NjU3LTIwMjdhMmIxYjFjNg.jpg"
+  },
+  {
+    "camper": "Alexander Black, Jr.",
+    "quote": "Work with the Kopernik nonprofit gave us the opportunity to learn how to build Chrome extensions and showcase our skills a full-stack developers.",
+    "github": "alexblackjr",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA553L4BgfgBR-M9RQc7x5matd6FUx3a6-I&authType=NAME_SEARCH&authToken=TW_a&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A242867390%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444634592237%2Ctas%3Aalexander%20black%20jr",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAANmAAAAJDQ1ZWIxMmVjLTAwNjUtNDFlNS04OWVhLTk4ZGZkNmViODkxNw.jpg"
+  },
+  {
+    "camper": "Travis Wouters",
+    "quote": "Free Code Camp helped me add skillsets to my resume that show experience instead of knowledge without practical application.",
+    "github": "",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAABHP0YBddxsmaf2OghV2jAy17RVMhig4RM&authType=NAME_SEARCH&authToken=a7pC&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A4669254%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444634846844%2Ctas%3ATravis%20Wouters",
+    "image": "https://media.licdn.com/media/p/8/005/07d/2f1/1792a44.jpg"
+  },
+  {
+    "camper": "Meta Hirschl",
+    "quote": "By building a robust and highly functional web app I was able to not only increase my confidence but was able to show potential employers what I was able to create. Both were huge for me and led me to getting a fantastic job.",
+    "github": "MetaCoderHirschl",
+    "linkedin": "https://www.linkedin.com/profile/view?id=ADEAAAKX2fEBfeZ1GVdOh-c0zzkYZKw38o8qzow&authType=NAME_SEARCH&authToken=hfRS&locale=en_US&srchid=147930701444634954491&srchindex=1&srchtotal=1&trk=vsrp_people_res_photo&trkInfo=VSRPsearchId%3A147930701444634954491%2CVSRPtargetId%3A43506161%2CVSRPcmpt%3Aprimary%2CVSRPnm%3Atrue%2CauthType%3ANAME_SEARCH",
+    "image": "https://media.licdn.com/media/p/6/005/0ac/31c/05f0e58.jpg"
+  },
+  {
+    "camper": "Geoff Storbeck",
+    "quote": "I've been able to build tools that has helped moved my current career further and has opened up many more doors in the field.",
+    "github": "storbeck",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAdVQZYBHPYLt5efKwqZmiDM5SqIdH0_AR4&authType=NAME_SEARCH&authToken=EDd-&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A123027862%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635255807%2Ctas%3AGeoff%20Storbeck%09",
+    "image": "https://media.licdn.com/media/p/1/000/124/306/339eee6.jpg"
+  },
+  {
+    "camper": "Jonathan Lucas",
+    "quote": "Free Code Camp has been nothing but supportive and helpful, taking me from a rather basic knowledge of front end technologies to a better, more complete understanding from a full stack perspective.",
+    "github": "jonslucas",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAATn9H4BI7BP7MBpZ0NR1EvldkWTvAdGy2w&authType=NAME_SEARCH&authToken=hLmG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A82310270%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635490853%2Ctas%3AJon%20Lucas",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAIcAAAAJGMxMjY3MmEwLTM0ODgtNGU3OS1hZjFiLTJjZjNhMDM3YTUyZQ.jpg"
+  },
+  {
+    "camper": "Ashley Drake",
+    "quote": "I just accepted a job offer as an engineer. I started Free Code Camp to switch careers and it has enabled me to do just that. The projects and community are amazing and made all of this work easier and more fun.",
+    "github": "aldraco",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABcdBycB1iVHvcW7N3yVK-18ES7Nrxx2jbE&authType=NAME_SEARCH&authToken=gKNN&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A387778343%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635725853%2Ctas%3Aashley%20",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAAKBAAAAJDEwYmY4ZDMwLTc3YzAtNDc2Yi04M2EzLTBlOWY0MzA4NTM5Yg.jpg"
+  },
+  {
+    "camper": "Brian Grant",
+    "quote": "I've received new employment opportunities and I have not even finished Free Code Camp's first 800 hours of training yet.",
+    "github": "codeseekingman",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAEUqXoBFOq1SWQrBsTMHG4ij9Ss4Qqnrtg&authType=NAME_SEARCH&authToken=a85-&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A18131322%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635878707%2Ctas%3Abrian%20grant",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAANEAAAAJGY5ZjZkMDVjLTJhY2EtNDZjYS1iMDk5LTY0ZDliN2EyODUxMQ.jpg"
+  },
+  {
+    "camper": "Thomas Joseph Izen",
+    "quote": "After spending lots of time trying different sites that aim to teach people how to code, FreeCodeCamp has been different from the beginning. They provide the best and most organized track for anyone at any level to learn how to code and build an amazing, marketable portfolio.",
+    "github": "TommyIzen",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA79qIYB_RHmvOP59S6VPK3Lm06oG8fM6dw&authType=NAME_SEARCH&authToken=PfeR&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A251504774%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444636112016%2Ctas%3AThomas%20%20Izen",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAMaAAAAJGRjZTQ4MTdmLTZmZGItNGFhNS1hNTE0LWJmYjFhZDY3YmM3MQ.jpg"
+  },
+  {
+    "camper": "Robert Trammel",
+    "quote": "I'm working a job integrating JavaScript into FileMaker and doing some custom web publishing for a school district. I've also have job offers from Apple and a few technology firms around the country. If it wasn't for Free Code Camp, I'd still be in the dark with some really awesome but irrelevant skills.",
+    "github": "comajama",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAIAABQsM30BEAI6xyAhk-OqbBNUJL0WD2uA3GE&authType=NAME_SEARCH&authToken=4xB-&trk=Skyline_click_NPS&sl=NPS%3B147930701444636308659%3B1%3B147930701444636308659%3B",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAAIBAAAAJDI5YjRmMTRmLTFjNWItNGQ5ZC05MTNjLTA0MWQ0YjRhOTdhNQ.jpg"
+  },
+  {
+    "camper": "Brian Atkins",
+    "quote": "I'm spending less time then I am used to on Free Code Camp because people have begun to hire me to work on their projects. Free Code Camp has provided me the foundation I have needed to get these jobs.",
+    "github": "BrianAtk",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAABtTx0BmDzmB7eDGOkAJbRw8RZdvysreso&authType=NAME_SEARCH&authToken=CecH&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A7163677%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444636556530%2Ctas%3ABrian%20Atkins",
+    "image": "https://media.licdn.com/media/p/8/000/2aa/36c/2d218a8.jpg"
+  },
+  {
+    "camper": "Normandy Real",
+    "quote": "I'm doing Free Code Camp to transition from mainframe programming to front end development.",
+    "github": "mandyreal",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAdebIIBHfcSRnxGI-j6g5y6crfOXSg55Dc&authType=NAME_SEARCH&authToken=xLNy&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A123628674%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444636619442%2Ctas%3ANormandy%20Real",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAAMrAAAAJDAxMmE0ZWI1LWU0MjctNDRjYS1hNjdkLTYwZTI5NjUxMDhjYw.jpg"
+  },
+  {
+    "camper": "David McGill",
+    "quote": "Even if you have a CS degree like I do, you still need projects to prove to employers that you care about coding. Free Code Camp provided me with a platform for doing this. It's all laid out for you - you just have step up and step into the map!",
+    "github": "dmcgill50",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAEBy74BHsJCpgrbohr2dJxbdXuvMuJDx6k&authType=NAME_SEARCH&authToken=9k8t&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A16894910%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444637012056%2Ctas%3ADavid%20McGill",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAANdAAAAJGE4YWI5NjFiLTQ5MzUtNGQwNC04YThiLWYxMTI4NWM3YmFlMQ.jpg"
+  },
   {
     "camper": "Qing Huang",
     "quote": "Free Code Camp gives me more confidence at work. Code doesn’t look as foreign anymore.",
@@ -34,6 +132,13 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADrtuwBOA_0ihkKIbUFXoXskXikQT9uVeo&authType=NAME_SEARCH&authToken=sctO&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A15447788%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907195702%2Ctas%3Alori",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/1/005/080/392/295a574.jpg"
   },
+  {
+    "camper": "Alex Dixon",
+    "quote": "I was hired by the owner of the company, a programmer with 25 years of experience in web development. I graduated from university with a degree in English and had no programming experience prior to attending FreeCodeCamp.",
+    "github": "alex-dixon",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABhCmLMBLAR1AXskaJXDMT-uLPZ8M7TynPQ&authType=NAME_SEARCH&authToken=k8uX&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A407017651%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444633871133%2Ctas%3Aalex%20dixon",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAMcAAAAJGZhM2Y2ZTU5LWNjODAtNDM5My1hYjAzLTYyYjFlOTcwZjVmZg.jpg"
+  },
   {
     "camper": "Ryan Lindeman",
     "quote": "Free Code Camp has been great in giving me a direct path to the full stack development skills I wanted to become more involved in projects at work.",
@@ -244,7 +349,6 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAACYvVUBTuu8dNRHthN1TFiyk137PLDqnv4&authType=NAME_SEARCH&authToken=V_iG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A10009941%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907639677%2Ctas%3Amarquin",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAZLAAAAJDQ5Nzg4MjJmLWUyMjQtNDI5Ny05NmY5LTE5Yjc1Y2Q1YWFhOA.jpg"
   },
-
   {
     "camper": "Devarsh Ruparelia",
     "quote": "Even though I am still just a high school student. The startup I intern for said that if I finish the full track of Free Code Camp, they will strongly consider me for their programming jobs. Thanks Free Code Camp!",
@@ -329,13 +433,6 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAFitUwByB_tgxdExntMnakgQnTK1H3eEd8&authType=NAME_SEARCH&authToken=230A&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A23246156%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907829391%2Ctas%3Aeric%20har",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/2/000/1e1/095/12800b6.jpg"
   },
-  {
-    "camper": "Brian Grant ",
-    "quote": "It has given me a place where like minded people are learning to code together. It has also inspired me to start a code camp here in the midwest.",
-    "github": "codeseekingman",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAEUqXoBFOq1SWQrBsTMHG4ij9Ss4Qqnrtg&authType=NAME_SEARCH&authToken=a85-&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A18131322%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907840255%2Ctas%3Abrian%20g",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAANEAAAAJGY5ZjZkMDVjLTJhY2EtNDZjYS1iMDk5LTY0ZDliN2EyODUxMQ.jpg"
-  },
   {
     "camper": "Danielle J Moss",
     "quote": "Aside from learning to code in a fun way, I also know I’m not alone and have somewhere to go when I do get stuck and need help.",
@@ -448,4 +545,4 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAOCUkABzCvw3p1mBiPbbFWq91BEFXGXKxA&authType=NAME_SEARCH&authToken=7zb7&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A58872384%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908068309%2Ctas%3Aanthony%20depa",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAJPAAAAJGI4NGY3ZGI1LWM2N2UtNGQ2Ni1iZDUwLTFkN2I4YWM2YThjMQ.jpg"
   }
-]
+]
\ No newline at end of file

From 5603531b7ff7bae1e782407e3c13c6bc8db2b07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADnez?= <jbm.public@yahoo.com>
Date: Mon, 12 Oct 2015 11:44:34 +0000
Subject: [PATCH 082/140] Fixes background-color required twice to pass

---
 seed/challenges/html5-and-css.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index f4a6cd5d7b..99a0753ad0 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -3702,7 +3702,7 @@
         "Let's replace the hex code in our <code>body</code> element's background color with the RGB value for black: <code>rgb(0, 0, 0)</code>"
       ],
       "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of black.')",
+        "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 0)\", 'Your <code>body</code> element should have a black background.')",
         "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of black. For example <code>body { color&#58; rgb&#40;0&#44; 0&#44; 0&#41;; }</code>.')"
       ],
       "challengeSeed": [
@@ -3736,7 +3736,7 @@
         "Change the <code>body</code> element's background color from the RGB value for black to the <code>rgb</code> value for white: <code>rgb(255, 255, 255)</code>"
       ],
       "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(255, 255, 255)\", 'Give your <code>body</code> element the <code>background-color</code> of white.')",
+        "assert($(\"body\").css(\"background-color\") === \"rgb(255, 255, 255)\", 'Your <code>body</code> should have a white background.')",
         "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*255\\s*,\\s*255\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of white. For example <code>body { background-color&#58; rgb&#40;255&#44; 255 &#44; 255&#41;; }</code>.')"
       ],
       "challengeSeed": [
@@ -3770,7 +3770,7 @@
         "Change the <code>body</code> element's background color to the RGB value red: <code>rgb(255, 0, 0)</code>"
       ],
       "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(255, 0, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of red.')",
+        "assert($(\"body\").css(\"background-color\") === \"rgb(255, 0, 0)\", 'Your <code>body</code> should have a red background.')",
         "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of red. For example <code>body { background-color&#58; rgb&#40;255&#44; 0&#44; 0&#41;; }</code>.')"
       ],
       "challengeSeed": [
@@ -3802,7 +3802,7 @@
         "Now change the <code>body</code> element's background color to the <code>rgb</code> value green: <code>rgb(0, 255, 0)</code>"
       ],
       "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(0, 255, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of green.')",
+        "assert($(\"body\").css(\"background-color\") === \"rgb(0, 255, 0)\", 'Your <code>body</code> element should have a green background.')",
         "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*255\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of green. For example <code>body { background-color&#58; rgb&#40;0&#44; 255&#44; 0&#41;; }</code>.')"
       ],
       "challengeSeed": [
@@ -3834,7 +3834,7 @@
         "Change the <code>body</code> element's background color to the RGB value blue: <code>rgb(0, 0, 255)</code>"
       ],
       "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 255)\", 'Give your <code>body</code> element the background-color of blue.')",
+        "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 255)\", 'Your <code>body</code> element should have a blue background.')",
         "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*255\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of blue. For example <code>body { background-color&#58; rgb&#40;0&#44; 0&#44; 255&#41;; }</code>.')"
       ],
       "challengeSeed": [
@@ -3867,7 +3867,7 @@
         "Change the <code>body</code> element's background color to the RGB value orange: <code>rgb(255, 165, 0)</code>"
       ],
       "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(255, 165, 0)\", 'Give your <code>body</code> element the background-color of orange.')",
+        "assert($(\"body\").css(\"background-color\") === \"rgb(255, 165, 0)\", 'Your <code>body</code> element should have an orange background.')",
         "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*165\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of orange. For example <code>body { background-color&#58; rgb&#40;255&#44; 165&#44; 0&#41;; }</code>.')"
       ],
       "challengeSeed": [
@@ -3900,7 +3900,7 @@
         "Change the <code>body</code> element's background color to the RGB value for gray: <code>rgb(128, 128, 128)</code>"
       ],
       "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(128, 128, 128)\", 'Give your <code>body</code> element the background-color of gray.')",
+        "assert($(\"body\").css(\"background-color\") === \"rgb(128, 128, 128)\", 'Your <code>body</code> element should have a gray background.')",
         "assert(editor.match(/rgb\\s*\\(\\s*128\\s*,\\s*128\\s*,\\s*128\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of gray. For example <code>body { background-color&#58; rgb&#40;128&#44; 128&#44; 128&#41;; }</code>.')"
       ],
       "challengeSeed": [

From 5c6d4477547d6b5b809e2e2260ee804fda711db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladimir=20T=C3=A1mara=20Pati=C3=B1o?=
 <vtamara@pasosdeJesus.org>
Date: Mon, 12 Oct 2015 10:07:33 -0500
Subject: [PATCH 083/140] equal button instead of clear button

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

diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index a13e962f7c..94b59f69d1 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -202,7 +202,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 add, subtract, multiply and divide two numbers.",
         "<span class='text-info'>Bonus User Story:</span> I can clear the input field with a clear button.",
-        "<span class='text-info'>Bonus User Story:</span> I can keep chaining mathematical operations together until I hit the clear button, and the calculator will tell me the correct output.",
+        "<span class='text-info'>Bonus User Story:</span> I can keep chaining mathematical operations together until I hit the equal button, and the calculator will tell me the correct output.",
         "Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a> if you get stuck.",
         "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 from fellow campers, click this button and paste in a link to your CodePen project. <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:%20PASTE_YOUR_CODEPEN_URL_HERE%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"

From f30239fb6c80734c1e69de6549bd650dde9b26dd Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Mon, 12 Oct 2015 22:56:10 -0700
Subject: [PATCH 084/140] add time estimates to challenge blocks on map

---
 seed/challenges/advanced-bonfires.json        |  1 +
 seed/challenges/angularjs.json                |  1 +
 .../automated-testing-and-debugging.json      |  1 +
 seed/challenges/basejumps.json                |  1 +
 seed/challenges/basic-bonfires.json           |  1 +
 seed/challenges/basic-javascript.json         |  1 +
 seed/challenges/basic-ziplines.json           |  1 +
 seed/challenges/bootstrap.json                |  1 +
 .../front-end-development-certificate.json    |  1 +
 .../full-stack-development-certificate.json   |  1 +
 seed/challenges/gear-up-for-success.json      |  1 +
 seed/challenges/getting-started.json          |  1 +
 seed/challenges/git.json                      |  1 +
 seed/challenges/hikes.json                    |  1 +
 seed/challenges/html5-and-css.json            |  1 +
 seed/challenges/intermediate-bonfires.json    |  1 +
 seed/challenges/intermediate-ziplines.json    |  1 +
 seed/challenges/jquery.json                   |  1 +
 seed/challenges/mongodb.json                  |  1 +
 seed/challenges/nodejs-and-expressjs.json     |  1 +
 ...t-oriented-and-functional-programming.json |  1 +
 .../upper-intermediate-bonfires.json          |  1 +
 seed/index.js                                 |  1 +
 server/boot/challenge.js                      |  3 +-
 server/views/challengeMap/show.jade           | 68 ++++++++++---------
 25 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index a4488b8696..e6dc2474c3 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -1,6 +1,7 @@
 {
   "name": "Advanced Algorithm Scripting",
   "order": 15,
+  "time": "50h",
   "challenges": [
     {
       "id": "aff0395860f5d3034dc0bfc9",
diff --git a/seed/challenges/angularjs.json b/seed/challenges/angularjs.json
index 92c85e751b..905c120f33 100644
--- a/seed/challenges/angularjs.json
+++ b/seed/challenges/angularjs.json
@@ -1,6 +1,7 @@
 {
   "name": "AngularJS",
   "order": 16,
+  "time": "5h",
   "challenges": [
     {
       "id": "bd7154d8c441eddfaeb5bdef",
diff --git a/seed/challenges/automated-testing-and-debugging.json b/seed/challenges/automated-testing-and-debugging.json
index b5ab25c2f9..0c7304045b 100644
--- a/seed/challenges/automated-testing-and-debugging.json
+++ b/seed/challenges/automated-testing-and-debugging.json
@@ -1,6 +1,7 @@
 {
   "name": "Automated Testing and Debugging",
   "order": 14,
+  "time": "15m",
   "challenges": [
     {
       "id":"cf1111c1c16feddfaeb6bdef",
diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index b665d28622..627e95482f 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -1,6 +1,7 @@
 {
   "name": "Full Stack JavaScript Projects",
   "order": 20,
+  "time": "300h",
   "challenges": [
     {
       "id": "bd7158d8c443eddfaeb5bcef",
diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 2c22329088..2c5a3667d2 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -1,6 +1,7 @@
 {
   "name": "Basic Algorithm Scripting",
   "order": 8,
+  "time": "50h",
   "challenges": [
     {
       "id": "ad7123c8c441eddfaeb5bdef",
diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index f9caca1efe..7d88e724ce 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1,6 +1,7 @@
 {
   "name": "Basic JavaScript",
   "order": 6,
+  "time": "3h",
   "challenges": [
     {
       "id":"bd7123c9c441eddfaeb4bdef",
diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index a13e962f7c..dd13678621 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -1,6 +1,7 @@
 {
   "name": "Basic Front End Development Projects",
   "order": 9,
+  "time": "100h",
   "challenges": [
     {
       "id": "bd7158d8c442eddfbeb5bd1f",
diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index 3982fe18d5..91e0e5e776 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -1,6 +1,7 @@
 {
   "name": "Responsive Design with Bootstrap",
   "order": 3,
+  "time": "2h",
   "challenges": [
     {
       "id": "bad87fee1348bd9acde08712",
diff --git a/seed/challenges/front-end-development-certificate.json b/seed/challenges/front-end-development-certificate.json
index 65b98018c6..4d6a83c406 100644
--- a/seed/challenges/front-end-development-certificate.json
+++ b/seed/challenges/front-end-development-certificate.json
@@ -1,6 +1,7 @@
 {
   "name": "Claim Your Front End Development Certificate",
   "order": 12,
+  "time": "5m",
   "challenges": [
     {
       "id": "561add10cb82ac38a17513be",
diff --git a/seed/challenges/full-stack-development-certificate.json b/seed/challenges/full-stack-development-certificate.json
index d383fc5a0f..1d0cd92963 100644
--- a/seed/challenges/full-stack-development-certificate.json
+++ b/seed/challenges/full-stack-development-certificate.json
@@ -1,6 +1,7 @@
 {
   "name": "Claim Your Full Stack Development Certificate",
   "order": 21,
+  "time": "5m",
   "challenges": [
     {
       "id": "660add10cb82ac38a17513be",
diff --git a/seed/challenges/gear-up-for-success.json b/seed/challenges/gear-up-for-success.json
index d11fdecf6e..0eb45c60a0 100644
--- a/seed/challenges/gear-up-for-success.json
+++ b/seed/challenges/gear-up-for-success.json
@@ -1,6 +1,7 @@
 {
   "name": "Gear up for Success",
   "order": 4,
+  "time": "10m",
   "challenges": [
     {
       "id": "560add65cb82ac38a17513c2",
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index 8f8b559eb7..87ba38e5a2 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -1,6 +1,7 @@
 {
   "name": "Get Started with Free Code Camp",
   "order": 1,
+  "time": "10m",
   "challenges": [
     {
       "id": "560add10cb82ac38a17513be",
diff --git a/seed/challenges/git.json b/seed/challenges/git.json
index d3abf068ba..8a642ab615 100644
--- a/seed/challenges/git.json
+++ b/seed/challenges/git.json
@@ -1,6 +1,7 @@
 {
   "name": "Git",
   "order" : 17,
+  "time": "3h",
   "challenges": [
     {
       "id": "bd7353d8c341eddeaeb5bd0f",
diff --git a/seed/challenges/hikes.json b/seed/challenges/hikes.json
index 1f5d7f3113..0e9dbb56a4 100644
--- a/seed/challenges/hikes.json
+++ b/seed/challenges/hikes.json
@@ -1,6 +1,7 @@
 {
   "name": "Hikes",
   "order": 0.050,
+  "time": "3h",
   "challenges": [
     {
       "id": "bd7128d8c441eddfbeb5bddf",
diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index f4a6cd5d7b..41c46c2126 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -1,6 +1,7 @@
 {
   "name": "HTML5 and CSS",
   "order": 2,
+  "time": "3h",
   "challenges": [
     {
       "id": "bd7123c8c441eddfaeb5bdef",
diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index ae17999083..38f77d9631 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -1,6 +1,7 @@
 {
   "name": "Intermediate Algorithm Scripting",
   "order": 10,
+  "time": "50h",
   "challenges": [
     {
       "id": "a3566b1109230028080c9345",
diff --git a/seed/challenges/intermediate-ziplines.json b/seed/challenges/intermediate-ziplines.json
index 27680d7350..fd3ea5b5e9 100644
--- a/seed/challenges/intermediate-ziplines.json
+++ b/seed/challenges/intermediate-ziplines.json
@@ -1,6 +1,7 @@
 {
   "name": "Intermediate Front End Development Projects",
   "order": 11,
+  "time": "200h",
   "challenges": [
     {
       "id": "bd7158d8c442eddfaeb5bd10",
diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index 6aa103d38c..e220c99d29 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -1,6 +1,7 @@
 {
   "name": "jQuery",
   "order": 5,
+  "time": "2h",
   "challenges": [
     {
       "id": "bad87fee1348bd9acdd08826",
diff --git a/seed/challenges/mongodb.json b/seed/challenges/mongodb.json
index 437a4da2e6..0fe93ba6f9 100644
--- a/seed/challenges/mongodb.json
+++ b/seed/challenges/mongodb.json
@@ -1,6 +1,7 @@
 {
   "name": "MongoDB",
   "order" : 19,
+  "time": "3h",
   "challenges": [
     {
       "id": "bd7243d8c341eddeaeb5bd0f",
diff --git a/seed/challenges/nodejs-and-expressjs.json b/seed/challenges/nodejs-and-expressjs.json
index 6eb04629c0..36b2231409 100644
--- a/seed/challenges/nodejs-and-expressjs.json
+++ b/seed/challenges/nodejs-and-expressjs.json
@@ -1,6 +1,7 @@
 {
   "name": "Node.js and Express.js",
   "order" : 18,
+  "time": "20h",
   "challenges": [
     {
       "id": "bd7153d8c441eddfaeb5bd0f",
diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index 7e890b52fe..8f1c7a8a1a 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -1,6 +1,7 @@
 {
   "name": "Object Oriented and Functional Programming",
   "order": 7,
+  "time": "1h",
   "note": [
     "Methods",
     "Closures",
diff --git a/seed/challenges/upper-intermediate-bonfires.json b/seed/challenges/upper-intermediate-bonfires.json
index b1ddbc2ac1..126da14507 100644
--- a/seed/challenges/upper-intermediate-bonfires.json
+++ b/seed/challenges/upper-intermediate-bonfires.json
@@ -1,6 +1,7 @@
 {
   "name": "Upper Intermediate Algorithm Scripting",
   "order": 13,
+  "time": "50h",
   "challenges": [
     {
       "id": "a2f1d72d9b908d0bd72bb9f6",
diff --git a/seed/index.js b/seed/index.js
index bd05f2de96..464242c26e 100644
--- a/seed/index.js
+++ b/seed/index.js
@@ -68,6 +68,7 @@ Challenge.destroyAll(function(err, info) {
         challenge.suborder = index + 1;
         challenge.block = block;
         challenge.isBeta = challenge.isBeta || isBeta;
+        challenge.time = challengeSpec.time;
 
         return challenge;
       });
diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 3b973cc0ac..218e5fc321 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -555,7 +555,8 @@ module.exports = function(app) {
           name: blockArray[0].block,
           dashedName: dasherize(blockArray[0].block),
           challenges: blockArray,
-          completed: completedCount / blockArray.length * 100
+          completed: completedCount / blockArray.length * 100,
+          time: blockArray[0] && blockArray[0].time || "???"
         };
       })
       .filter(({ name }) => name !== 'Hikes')
diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index db351b7af8..ae0370b802 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -85,40 +85,44 @@ block content
                         .spacer.negative-55
 
                     .row
-                        .col-xs-12.col-sm-8.col-sm-offset-2
-                            h3 #{challengeBlock.name}
+                        .hidden-xs.col-sm-3.col-md-2
+                            h3.text-primary.text-right
+                                i.fa.fa-clock-o #{challengeBlock.time}
+                        .col-xs-12.col-sm-9.col-md-10
+                            h3 #{challengeBlock.name} &thinsp;
+
+
                     .row
-                        .col-xs-12
-                            ol
-                                for challenge in challengeBlock.challenges
-                                    if challenge.completed
-                                        .row
-                                            .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.map-p.negative-10
-                                            .col-xs-12.col-sm-9.col-md-10
-                                                li.faded.map-p.negative-10
-                                                    a(href="/challenges/#{challenge.dashedName}")
-                                                        span.capitalize= challenge.type + ': '
-                                                        span= challenge.title
-                                                            span.sr-only= " Complete"
-
-
-                                    else
-                                        .row
-                                            .hidden-xs.col-sm-3.col-md-2
-                                                span.negative-10
-                                            .col-xs-12.col-sm-9.col-md-10
-                                                li.map-p.negative-10
-                                                    a(href="/challenges/#{challenge.dashedName}")
-                                                        span.capitalize= challenge.type + ': '
-                                                        span= challenge.title
-                                                            span.sr-only= " Incomplete"
-
-                                if (challengeBlock.completed === 100)
-                                    .button-spacer
+                        ol
+                            for challenge in challengeBlock.challenges
+                                if challenge.completed
                                     .row
-                                        .col-xs-12.col-sm-8.col-md-6.col-sm-offset-3.col-md-offset-2.hidden
-                                            a.btn.btn-lg.btn-block.signup-btn.map-challenge-block-share Section complete. Share your Portfolio with your friends.
-                                                .hidden(id="#{challengeBlock.name}")
+                                        .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.map-p.negative-10
+                                        .col-xs-12.col-sm-9.col-md-10
+                                            li.faded.map-p.negative-10
+                                                a(href="/challenges/#{challenge.dashedName}")
+                                                    span.capitalize= challenge.type + ': '
+                                                    span= challenge.title
+                                                        span.sr-only= " Complete"
+
+
+                                else
+                                    .row
+                                        .hidden-xs.col-sm-3.col-md-2
+                                            span.negative-10
+                                        .col-xs-12.col-sm-9.col-md-10
+                                            li.map-p.negative-10
+                                                a(href="/challenges/#{challenge.dashedName}")
+                                                    span.capitalize= challenge.type + ': '
+                                                    span= challenge.title
+                                                        span.sr-only= " Incomplete"
+
+                            if (challengeBlock.completed === 100)
+                                .button-spacer
+                                .row
+                                    .col-xs-12.col-sm-8.col-md-6.col-sm-offset-3.col-md-offset-2.hidden
+                                        a.btn.btn-lg.btn-block.signup-btn.map-challenge-block-share Section complete. Share your Portfolio with your friends.
+                                            .hidden(id="#{challengeBlock.name}")
     script.
         var username = !{JSON.stringify(user && user.username || '')};
         var lastCompleted = !{JSON.stringify(lastCompleted || false)}

From 8da93ddea9d8b208117b08444d744f81ef797ba8 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Mon, 12 Oct 2015 23:02:24 -0700
Subject: [PATCH 085/140] add spacing and nowrap to ensure time stays on single
 line

---
 server/views/challengeMap/show.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index ae0370b802..14243dee9b 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -86,8 +86,8 @@ block content
 
                     .row
                         .hidden-xs.col-sm-3.col-md-2
-                            h3.text-primary.text-right
-                                i.fa.fa-clock-o #{challengeBlock.time}
+                            h3.text-primary.text-right.nowrap
+                                i.fa.fa-clock-o &thinsp;#{challengeBlock.time}
                         .col-xs-12.col-sm-9.col-md-10
                             h3 #{challengeBlock.name} &thinsp;
 

From 277fcb49cab024b0a27de9c1e844aa20593467e3 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 13 Oct 2015 01:47:53 -0700
Subject: [PATCH 086/140] add the codepen challenge

---
 seed/challenges/basic-ziplines.json | 68 +++++++++++++++--------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index 94b59f69d1..f133fceac5 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -5,46 +5,48 @@
     {
       "id": "bd7158d8c442eddfbeb5bd1f",
       "title": "Get Set for Ziplines",
-      "difficulty": 1.00,
-      "challengeSeed": ["125658022"],
+      "challengeSeed": [],
       "description": [
-        "Now you're ready to start our Zipline challenges. These front-end development challenges will give you many opportunities to apply the HTML, CSS, jQuery and JavaScript you've learned to build static (database-less) applications.",
-        "Whatever you do, don't get discouraged! Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a> if you get stuck.",
-        "We'll build these challenges using CodePen, a popular tool for creating, sharing, and discovering static web applications.",
-        "Go to <a href='http://codepen.io' target='_blank'>http://codepen.io</a> and create an account.",
-        "Click your user image in the top right corner, then click the \"New pen\" button that drops down.",
-        "Drag the windows around and press the buttons in the lower-right hand corner to change the orientation to suit your preference.",
-        "Click the gear next to CSS. Then under the \"Add External CSS\" section, use the \"Quick-add\" select box to select Bootstrap. Then click \"Save & Close\".",
-        "Verify that bootstrap is active by adding the following code to your HTML: <code>&lt;h1 class='text-primary'&gt;Hello CodePen!&lt;/h1&gt;</code>. The text's color should be Bootstrap blue.",
-        "Click the gear next to JavaScript. Click the \"Quick-add\" select box and choose jQuery (not jQuery UI).",
-        "Click the \"Quick-add\" select box again and choose Bootstrap. Then click \"Save & Close\".",
-        "Now add the following code to your JavaScript: <code>$(document).ready(function() { $('.text-primary').text('Hi CodePen!') });</code>. Click the \"Save\" button at the top. Your \"Hello CodePen!\" should change to \"Hi CodePen!\". This means that jQuery is working.",
-        "You can use this CodePen that you've just created as a starting point for your Ziplines. Just click the \"fork\" button at the top of your CodePen and it will create a duplicate CodePen.",
-        "Now you're ready for your first Zipline. Click the \"I've completed this challenge\" button."
+        [
+          "http://i.imgur.com/6WLULsC.gif",
+          "A gif showing how to create a Codepen account.",
+          "For our front end Zipline challenges, we'll use a popular browser-based code editor CodePen. Open CodePen and click \"Sign up\" in the upper right hand corner, then scroll down to the free plan and click \"Sign up\" again. Click the \"Use info from GitHub button\", then add your email address and create a password. Click the \"Sign up\" button. Then in the upper right hand corner, click \"New pen\".",
+          "http://codepen.io"
+        ],
+        [
+          "http://i.imgur.com/U4y9RJ1.gif",
+          "A gif showing that you can type \"hello world\" will output \"hello world\" in the preview window. You can also drag windows to resize them, and change their orientation.",
+          "In the HTML box, create an h1 element with the text \"Hello World\". You can drag the frames around to resize them. You can also click the \"Change View\" button and change the orientation of the frames.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/G9KFQDL.gif",
+          "A gif showing the process of adding Bootstrap to your pen.",
+          "Click the gear in the upper left hand corner of the CSS box, then scroll down to \"Quick add\" and choose Bootstrap. Now give your h1 element the class of \"text-primary\" to change its color and prove that Bootstrap is now available.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/Gi3aig0.gif",
+          "A gif showing the process of adding Animate.css and jQuery to pen.",
+          "Click the gear in the upper left hand corner of the CSS box, then scroll down to \"Quick add\" and choose Animate.css. Click the gear in the upper left hand corner of the JS box, then scroll down to \"Quick add\" and choose jQuery. Prove that Animate.css and jQuery are loaded properly. In the JS box, add the following code to make your h1 element bounce: <code>$(document).ready(function(){ $(\"h1\").addClass(\"animated bounce\"); });</code>.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/Wzt6Y9Y.gif",
+          "A gif showing the process of saving and forking a pen.",
+          "Save your pen with the \"Save\" button. Then click the \"Fork\" button. This will create a fork (copy) of your pen that you can experimient with.",
+          ""
+        ]
       ],
-      "type": "waypoint",
-      "challengeType": 2,
+      "type": "Waypoint",
+      "challengeType": 7,
       "tests": [],
       "nameCn": "",
       "descriptionCn": [],
       "nameFr": "",
       "descriptionFr": [],
-      "nameRu": "Приготовьтесь к Zipline'ам",
-      "descriptionRu": [
-        "Теперь вы готовы приступить к Zipline'ам. Это задания по фронт-энд разработке, в них вы примените ранее изученные HTML, CSS, jQuery и JavaScript и создадите статические (не использующие базу данных) приложения.",
-        "Ни в коем случае не унывайте! Воспользуйтесь <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a>, если что-то не получается.",
-        "Задания мы будем выполнять используя CodePen - популярный инструмент для создания и обмена статическими веб приложениями.",
-        "Перейдите по ссылке <a href='http://codepen.io' target='_blank'>http://codepen.io</a> и создайте аккаунт.",
-        "Нажмите на ваш аватар в правом верхнем углу, а затем в открывшемся меню на кнопку \"New pen\".",
-        "Выберите удобное расположение окон с помощью кнопок в правом нижнем углу, отрегулируйте их ширину.",
-        "Нажмите на звездочку рядом с CSS. Затем в секции \"Add External CSS\" выберите \"Quick-add\" и добавьте Bootstrap. Нажмите \"Save & Close\".",
-        "Проверьте, что Bootstrap подключен добавив следующий HTML код: <code>&lt;h1 class='text-primary'&gt;Hello CodePen!&lt;/h1&gt;</code>. Цвет текста должен быть синим.",
-        "Нажмите на звездочку рядом с JavaScript. Нажмите \"Quick-add\" и выберите jQuery (не jQuery UI). Нажмите \"Save & Close\".",
-        "Снова нажмите на поле \"Quick-add\", выберите Bootstrap и затем нажмите \"Save & Close\".",
-        "Теперь добавьте следующий код в окошко JavaScript: <code>$(document).ready(function() { $('.text-primary').text('Hi CodePen!') });</code>. Нажмите на кнопку \"Save\" расположенную наверху. Текст \"Hello CodePen!\" должен измениться на \"Hi CodePen!\". Это значит что jQuery работает.",
-        "CodePen, который мы создали, можно использовать в качестве отправной точки для ваших Zipline'ов. Кликните кнопку \"fork\", чтобы создать копию текущего CodePen'a.",
-        "Все готово для первого Zipline'а. Жмите кнопку \"I've completed this challenge\"."
-      ],
+      "nameRu": "",
+      "descriptionRu": [],
       "nameEs": "",
       "descriptionEs": [],
       "namePt": "",

From 6013a5e3ff4715a2681afd9c50e5598d08ccca98 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 13 Oct 2015 02:04:09 -0700
Subject: [PATCH 087/140] update gear up and getting started challenges

---
 seed/challenges/gear-up-for-success.json |  4 +--
 seed/challenges/getting-started.json     | 36 ++++++++++--------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/seed/challenges/gear-up-for-success.json b/seed/challenges/gear-up-for-success.json
index d11fdecf6e..b73404a129 100644
--- a/seed/challenges/gear-up-for-success.json
+++ b/seed/challenges/gear-up-for-success.json
@@ -60,9 +60,9 @@
       "challengeSeed": [],
       "description": [
         [
-          "http://i.imgur.com/P7qfJXt.gif",
+          "http://i.imgur.com/vJyiXzU.gif",
           "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
-          "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
+          "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development Certification\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
           "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
         ]
       ],
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index 8f8b559eb7..bd3638725f 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -9,13 +9,13 @@
       "description": [
         [
           "http://i.imgur.com/RlEk2IF.jpg",
-          "a picture of Free Code Camp's 4 benefits: Get connected, Learn JavaScript, Build your Portfolio, Help nonprofits",
+          "A picture of Free Code Camp's 4 benefits: Get connected, Learn JavaScript, Build your Portfolio, Help nonprofits",
           "Welcome to Free Code Camp. We're an open source community of busy people who learn to code and help nonprofits.",
           ""
         ],
         [
           "http://i.imgur.com/pYsTbjI.jpg",
-          "a screenshot of our curriculum alongside a screenshot of our chat room.",
+          "A screenshot of our curriculum alongside a screenshot of our chat room.",
           "Learning to code is hard. To succeed, you'll need lots of practice and support. That's why we've created a rigorous curriculum and supportive community.",
           ""
         ],
@@ -33,13 +33,13 @@
         ],
         [
           "http://i.imgur.com/sKYQhdG.jpg",
-          "a screenshot of our Front End Development Certificate",
+          "A screenshot of our Front End Development Certificate",
           "About half way through our curriculum, you'll earn a verified Front End Development Certificate. If you can finish our entire curriculum, you'll earn a verified Full Stack Development Certificate.",
           ""
         ],
         [
           "http://i.imgur.com/yXyxbDd.jpg",
-          "a screen shot of our nonprofit project directory.",
+          "A screen shot of our nonprofit project directory.",
           "Then you'll build several real-life projects for nonprofits. By the time you finish, you'll have a portfolio of real apps that people use every day.",
           ""
         ]
@@ -65,7 +65,7 @@
       "description": [
         [
           "http://i.imgur.com/EAR7Lvh.jpg",
-          "a screenshot of our one of our Gitter chat rooms.",
+          "A screenshot of our one of our Gitter chat rooms.",
           "Now let's join Free Code Camp's chat rooms. You can come here any time of day to hang out, ask questions, or find another camper to pair program with. First you'll need a GitHub account.",
           ""
         ],
@@ -83,14 +83,14 @@
         ],
         [
           "http://i.imgur.com/OXL3G3n.gif",
-          "Click the link below to navigate to Free Code Camp's open-source repository. In the upper right hand corner, you can click the \"star\" button to star this repository.",
+          "A gif showing how you can star a GitHub repo.",
           "Go to Free Code Camp's open-source repository and \"star\" it. \"Starring\" is the GitHub equivalent of \"liking\" something.",
           "https://github.com/freecodecamp/freecodecamp"
         ],
         [
-          "http://i.imgur.com/EZHzKCV.gif",
+          "http://i.imgur.com/zwYPeQT.gif",
           "A gif showing you how to click the link below to go to our chat room and click the \"sign in with GitHub\" button. Then you can click into the text input field and type a message to your fellow campers.",
-          " Now that you have a GitHub account, you can join our main chat room by logging in with GitHub. Introduce yourself by saying \"Hello world!\". Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
+          "Now that you have a GitHub account, you can join our main chat room by logging in with GitHub. Introduce yourself by saying \"Hello world!\". Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
           "https://gitter.im/FreeCodeCamp/FreeCodeCamp"
         ],
         [
@@ -112,7 +112,7 @@
           ""
         ],
         [
-          "http://i.imgur.com/SLQ27Gr.gif",
+          "http://i.imgur.com/WvQvNGN.gif",
           "A gif showing how you can click the link below to download a native chat room app for your computer.",
           "You can also download the chat room app to your computer or phone.",
           "https://gitter.im/apps"
@@ -138,15 +138,9 @@
       "challengeSeed": [],
       "description": [
         [
-          "http://i.imgur.com/FkEzbto.gif",
+          "http://i.imgur.com/tP2ccTE.gif",
           "A gif showing how you can click your profile image in your upper right hand corner to your code portfolio and connect GitHub.",
-          "Check out your code portfolio. Click your picture in your upper right hand corner. To activate your code portfolio, you'll need to link your GitHub account with Free Code Camp.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/WKzEr1q.gif",
-          "A gif showing how you can access your code portfolio and hover over different days to see how many brownie points you got on those days.",
-          "Your code portfolio shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak.",
+          "Check out your code portfolio. Click your picture in your upper right hand corner. To activate your code portfolio, you'll need to link your GitHub account with Free Code Camp. Your code portfolio shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak.",
           ""
         ]
       ],
@@ -176,9 +170,9 @@
           ""
         ],
         [
-          "http://i.imgur.com/EZHzKCV.gif",
+          "http://i.imgur.com/fTFMjwf.gif",
           "A gif showing how you can click the link below, find your city on the list of Campsites, then click on the Facebook link for your city and join your city's Facebook group.",
-          "Find your city on this list, click the \"Facebook\" link, then click the \"Join group\" button to apply to join your city's Facebook group (someone from the campsite should approve you shortly). If your city isn't on this list, scroll to the bottom of the wiki article for instructions for how you can create your city's Campsite.",
+          "Find your city on this list and click it. This will take you to your city's Campsite's Facebook group. Click the \"Join group\" button to apply to join your city's Facebook group. Someone from the campsite should approve you shortly. If your city isn't on this list, scroll to the bottom of the wiki article for instructions for how you can create your city's Campsite.",
           "https://github.com/FreeCodeCamp/freecodecamp/wiki/List-of-Free-Code-Camp-city-based-Campsites"
         ]
       ],
@@ -226,8 +220,8 @@
           "https://gitter.im/FreeCodeCamp/Help"
         ],
         [
-          "http://i.imgur.com/WsfzvVo.gif",
-          "A gif showing us clicking the \"map\" button in our upper right hand corner and browsing our challenge map.",
+          "http://i.imgur.com/ZRgXraT.gif",
+          "A gif showing us scrolling through our challenge map.",
           "Now you're ready to start coding! The \"Map\" button in your upper right hand corner will show you our challenge map. This map shows all our coding challenges. We recommend that you complete these from top to bottom, at a sustainable pace. You can also return to your next challenge by clicking the \"Learn\" button.",
           ""
         ]

From a162c3eea5a3f5f86f15f440d033240a1ab76b68 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 13 Oct 2015 03:14:20 -0700
Subject: [PATCH 088/140] add clementine.js and codepen onboarding step
 challenges

---
 seed/challenges/basejumps.json      | 153 ++++++++++++++++++----------
 seed/challenges/basic-ziplines.json |   2 -
 2 files changed, 100 insertions(+), 55 deletions(-)

diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index b665d28622..edb7f45792 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -7,60 +7,107 @@
       "title": "Get Set for Basejumps",
       "challengeSeed": ["128451852"],
       "description": [
-        "<span class='text-info'>Objective:</span> Get the MEAN stack running on Cloud 9, push your code to GitHub, and deploy it to Heroku.",
-        "We'll build our Basejumps on Cloud 9, a powerful online code editor with a full Ubuntu Linux workspace, all running in the cloud.",
-        "If you don't already have Cloud 9 account, create one now at <a href='http://c9.io' target='_blank'>http://c9.io</a>.",
-        "Now let's get your development environment ready for a new Angular-Fullstack application provided by Yeoman.",
-        "Open up <a href='http://c9.io' target='_blank'>http://c9.io</a> and sign in to your account.",
-        "Click on the \"+\" icon at the top right of the c9.io page to create a new workspace.",
-        "Give your workspace a name and an optional description.",
-        "Choose Node.js in the selection area below the name field.",
-        "Click the \"Create workspace\" button.",
-        "Once C9 builds and loads your workspace, you should see a terminal window in the lower right hand corner. In this window use the following commands. You don't need to know what these mean at this point.",
-        "Never run this command on your local machine. But in your Cloud 9 terminal window, run: <code>rm -rf * && echo \"export NODE_PATH=$NODE_PATH:/home/ubuntu/.nvm/v0.10.35/lib/node_modules\" >> ~/.bashrc && source ~/.bashrc && npm install -g yo grunt grunt-cli generator-angular-fullstack && yo angular-fullstack</code>",
-        "Yeoman will prompt you to answer some questions. Answer them like this:",
-        "What would you like to write scripts with? <span class='text-success'>JavaScript</span>",
-        "What would you like to write markup with? <span class='text-success'>HTML</span>",
-        "What would you like to write stylesheets with? <span class='text-success'>CSS</span>",
-        "What Angular router would you like to use? <span class='text-success'>ngRoute</span>",
-        "Would you like to include Bootstrap? <span class='text-success'>Yes</span>",
-        "Would you like to include UI Bootstrap? <span class='text-success'>Yes</span>",
-        "Would you like to use MongoDB with Mongoose for data modeling? <span class='text-success'>Yes</span>",
-        "Would you scaffold out an authentication boilerplate? <span class='text-success'>Yes</span>",
-        "Would you like to include additional oAuth strategies? <span class='text-success'>Twitter</span>",
-        "Would you like to use socket.io? <span class='text-success'>No</span>",
-        "May bower anonymously report usage statistics to improve the tool over time? (Y/n) <span class='text-success'>Y</span>",
-        "You may get an error similar to <code> ERR! EEXIST, open ‘/home/ubuntu/.npm</code>. This is caused when Cloud9 runs out of memory and kills an install. If you get this, simply re-run this process with the command <code>yo angular-fullstack</code>. You will then be asked a few questions regarding the re-install. Answer them as follows:",
-        "Existing .yo-rc configuration found, would you like to use it? (Y/n) <span class='text-success'>Y</span>",
-        "Overwrite client/favicon.ico? (Ynaxdh) <span class='text-success'>Y</span>",
-        "To finish the installation run the commands: <code>bower install && npm install</code>",
-        "To start MongoDB, run the following commands in your terminal: <code>mkdir data && echo 'mongod --bind_ip=$IP --dbpath=data --nojournal --rest \"$@\"' > mongod && chmod a+x mongod && ./mongod</code>",
-        "You will want to open up a new terminal to work from by clicking on the + icon and select New Terminal",
-        "Start the application by running the following command in your new terminal window: <code>grunt serve</code>",
-        "Wait for the following message to appear: <code>xdg-open: no method available for opening 'http://localhost:8080' </code>. Now you can open the internal Cloud9 browser. To launch the browser select Preview in the toolbar then select the dropdown option Preview Running Application.",
-        "Turn the folder in which your application is running into a Git repository by running the following commands: <code>git init && git add . && git commit -am 'initial commit'</code>.",
-        "Now we need to add your GitHub SSH key to c9.io. Click the \"Add-on Services\" button in the lower left of your C9 dashboard. Click \"activate\" next to the GitHub icon.",
-        "A pop up will appear. Allow access to your account.",
-        "While still on the dashboard, under “Account Settings”, click the link for \"Show your SSH key\". Copy the key to you clipboard.",
-        "Sign in to <a href='http://github.com' target='_blank'>http://github.com</a> and navigate to the GitHub SSH settings page. Click the \"Add SSH Key\". Give your key the title \"cloud 9\". Paste your SSH Key into the \"Key\" box, then click \"Add Key\".",
-        "Create a new GitHub repository by  and clicking on the + button next to your username in the upper-right hand side of your screen, then selecting \"New Repository\".",
-        "Enter a project name, then click the \"Create Repository\" button.",
-        "Find the \"...or push an existing repository from the command line\" section and click the Copy to Clipboard button beside it.",
-        "Paste the commands from your clipboard into the Cloud9 terminal prompt. This will push your changes to your repository on Cloud 9 up to GitHub.",
-        "Check back on your GitHub profile to verify the changes were successfully pushed up to GitHub.",
-        "Now let's push your code to Heroku. If you don't already have a Heroku account, create one at <a href='http://heroku.com' target='_blank'>http://heroku.com</a>. You shouldn't be charged for anything, but you will need to add your credit card information to your Heroku before you will be able to use Heroku's free MongoLab add on.",
-        "Before you publish to Heroku, you should free up as much memory as possible on Cloud9. In each of the Cloud9 terminal prompt tabs where MongoDB and Grunt are running, press the <code>control + c</code> hotkey to shut down these processes.",
-        "Run the following command in a Cloud9 terminal prompt tab: <code>npm install grunt-contrib-imagemin --save-dev && npm install --save-dev && heroku login</code>. At this point, the terminal will prompt you to log in to Heroku from the command line.",
-        "Now run <code>yo angular-fullstack:heroku</code>. You can choose a name for your Heroku project, or Heroku will create a random one for you. You can choose whether you want to deploy to servers the US or the EU.",
-        "Set the config flag for your Heroku environment and add MongoLab for your MongoDB instance by running the following command: <code>cd ~/workspace/dist && heroku config:set NODE_ENV=production && heroku addons:add mongolab</code>.",
-        "As you build your app, you should frequently commit changes to your codebase. Make sure you're in the <code>~/workspace</code> directory by running <code>cd ~/workspace</code>. Then you can use this code to stage the changes to your changes and commit them: <code>git commit -am \"your commit message\"</code>. Note that you should replace \"your commit message\" with a short summary of the changes you made to your code, such as \"added a records controller and corresponding routes\".",
-        "You can push these new commits to GitHub by running <code>git push origin master</code>, and to Heroku by running <code>grunt --force && grunt buildcontrol:heroku</code>.",
-        "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out: <a href='https://github.com/clnhll/guidetobasejumps' target='_blank'>https://github.com/clnhll/guidetobasejumps</a>.",
-        "Now you're ready to move on to your first Basejump. Click the \"I've completed this challenge\" and move on."
+        [
+          "http://i.imgur.com/4IZjWZ3.gif",
+          "A gif showing how to create a c9.io account.",
+          "We recommend building our full stack Basejump challenges on c9.io, a powerful browser-based development environment. This save you hours of time that you would spend configuring your local computer to run Node.js and MongoDB - time you could instead spend coding. Create a c9.io account bu clicking the GitHub symbol in the upper right hand corner of the c9.io page. Click the big plus symbol to create a new workspace. Enter your email address when prompted.",
+          "http://c9.io"
+        ],
+        [
+          "http://i.imgur.com/F7i5Hhi.gif",
+          "A gif showing how to fill out the new workspace form",
+          "On c9.io, give your workspace a name, then leave \"Template\" as custom and create your workspace from this GitHub url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
+          ""
+        ],
+        [
+          "http://i.imgur.com/42m1vyr.gif",
+          "A gif showing you how to show hidden files.",
+          "Click the gear in the upper right corner of c9.io's file structure. Select \"show hidden files\".",
+          ""
+        ],
+        [
+          "http://i.imgur.com/qrE8xaK.gif",
+          "A gif showing you how to create a new file.",
+          "Right click and create a new file called <code>.env</code>.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/sULwMlo.gif",
+          "A gif showing you how to prep your environmental variables in your .env file.",
+          "Open your .env file and past this into it, then save it:",
+          "<code>GITHUB_KEY=</code>",
+          "<code>GITHUB_SECRET=</code>",
+          "<code>APP_URL=</code>",
+          ""
+        ],
+        [
+          "http://i.imgur.com/BH2qLhB.gif",
+          "A gif showing you how to open c9.io's preview window.",
+          "Open up your application in a preview tab by clicking window > share > application > open.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/EIiaiPg.gif",
+          "A gif showing you how to creat ea GitHub app using c9.io's preview URL.",
+          "Create a GitHub app for authentication and choose an \"Application name\". For the homepage URL, paste the URL from your preview tab. You'll also paste the URL from your preview tab into \"Authorization callback URL\", then add to it: <code>auth/github/callback</code>",
+          "https://github.com/settings/applications/new"
+        ],
+        [
+          "http://i.imgur.com/drPlNaE.gif",
+          "A gif showing you how to transfer GitHub's key and secret over to your .env file, as well as your c9.io URL.",
+          "GitHub will create an app and present you with a Client ID and a Client Secret. Set your .env file's GITHUB_KEY equal to the Client ID, and set your .env file's GITHUB_SECRET equal to the Client Secret. Copy the URL from the your preview tab and paste it into your .env file as your APP_URL.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/VqCmJOh.gif",
+          "A gif showing you how to update the ajax-functions.js file with your c9.io preview URL.",
+          "Open app/common/ajax-functions.js and replace \"http://localhost:8080/\" with the URL from your clipboard (the URL from your preview tab).",
+          ""
+        ],
+        [
+          "http://i.imgur.com/bLXrt6P.gif",
+          "A gif showing you how to start mongoDB in c9.io's terminal.",
+          "In your terminal, start MongoDB by entering <code>mongod --smallfiles</code>",
+          ""
+        ],
+        [
+          "http://i.imgur.com/TNygDfF.gif",
+          "A gif showing you how to open a new tab in c9.io's terminal.",
+          "Open a new terminal tab with the + button above your terminal, then run <code>npm install</code>",
+          ""
+        ],
+        [
+          "http://i.imgur.com/NYk4VeS.gif",
+          "A gif showing you how to navigate to your preview tab and sign in to your new Clementine.js app.",
+          "run <code>node server.js</code> to start the server. Refresh your preview tab. You should see the Clementine.js logo. Click \"sign in\" and accept GitHub's prompt to authorize the application.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/hA2MCee.gif",
+          "A gif showing you how to use Clementine.js's simple demo app.",
+          "Click the \"click me\" button and you'll see that it increments the number clicks. Click the profile button and you'll see that it has your GitHub information.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/Q8IfdQj.gif",
+          "A gif showing you how to create a commit on c9.io, then create a GitHub repository and push your code up to it.",
+          "Create a commit by typing <code>git add . && git commit -m\"first commit\"</code>. Then open GitHub in a new tab and click \"New repository\". Name your repository, then click \"Create repository\". Then copy its .git URL. Return to c9.io's terminal and set your GitHub remote URL: <code>git remote set-url origin</code> followed by the URL you copied from GitHub. Run <code>git push origin master</code>. Now tab back to GitHub and refresh, and you'll see that your code is now on GitHub.",
+          ""
+        ]
       ],
-      "type": "waypoint",
-      "challengeType": 2,
-      "tests": []
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
     },
     {
       "id": "bd7158d8c443eddfaeb5bdef",
diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index f133fceac5..b68158ef49 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -55,7 +55,6 @@
     {
       "id": "bd7158d8c242eddfaeb5bd13",
       "title": "Build a Personal Portfolio Webpage",
-      "difficulty": 1.01,
       "challengeSeed": ["133315782"],
       "description": [
         "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> app that successfully reverse-engineers this: <a href='http://codepen.io/ThiagoFerreir4/full/eNMxEp' target='_blank'>http://codepen.io/ThiagoFerreir4/full/eNMxEp</a>.",
@@ -109,7 +108,6 @@
     {
       "id": "bd7158d8c442eddfaeb5bd13",
       "title": "Build a Random Quote Machine",
-      "difficulty": 1.02,
       "challengeSeed": ["126415122"],
       "description": [
         "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> app that successfully reverse-engineers this: <a href='http://codepen.io/AdventureBear/full/vEoVMw' target='_blank'>http://codepen.io/AdventureBear/full/vEoVMw</a>.",

From 407bd16aaf7b04146f7f1d84d786576e9fccbcbf Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 13 Oct 2015 10:04:44 -0700
Subject: [PATCH 089/140] make additional improvements and fixes to step
 challenges

---
 seed/challenges/basejumps.json           | 4 ++--
 seed/challenges/basic-ziplines.json      | 4 ++--
 seed/challenges/gear-up-for-success.json | 2 +-
 seed/challenges/getting-started.json     | 2 +-
 server/views/coursewares/showStep.jade   | 2 +-
 server/views/partials/navbar.jade        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index edb7f45792..67a630d701 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -5,7 +5,7 @@
     {
       "id": "bd7158d8c443eddfaeb5bcef",
       "title": "Get Set for Basejumps",
-      "challengeSeed": ["128451852"],
+      "challengeSeed": [],
       "description": [
         [
           "http://i.imgur.com/4IZjWZ3.gif",
@@ -16,7 +16,7 @@
         [
           "http://i.imgur.com/F7i5Hhi.gif",
           "A gif showing how to fill out the new workspace form",
-          "On c9.io, give your workspace a name, then leave \"Template\" as custom and create your workspace from this GitHub url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
+          "Instead of starting from scratch, we recommend using Clementine.js, a full stack JavaScript \"boilerplate\" that already has some basic code written for you. On c9.io, give your workspace a name, then leave \"Template\" as custom and create your workspace from this GitHub url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
           ""
         ],
         [
diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index b68158ef49..e2487d14ef 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -10,7 +10,7 @@
         [
           "http://i.imgur.com/6WLULsC.gif",
           "A gif showing how to create a Codepen account.",
-          "For our front end Zipline challenges, we'll use a popular browser-based code editor CodePen. Open CodePen and click \"Sign up\" in the upper right hand corner, then scroll down to the free plan and click \"Sign up\" again. Click the \"Use info from GitHub button\", then add your email address and create a password. Click the \"Sign up\" button. Then in the upper right hand corner, click \"New pen\".",
+          "For our front end Zipline challenges, we'll use a popular browser-based code editor called CodePen. Open CodePen and click \"Sign up\" in the upper right hand corner, then scroll down to the free plan and click \"Sign up\" again. Click the \"Use info from GitHub button\", then add your email address and create a password. Click the \"Sign up\" button. Then in the upper right hand corner, click \"New pen\".",
           "http://codepen.io"
         ],
         [
@@ -28,7 +28,7 @@
         [
           "http://i.imgur.com/Gi3aig0.gif",
           "A gif showing the process of adding Animate.css and jQuery to pen.",
-          "Click the gear in the upper left hand corner of the CSS box, then scroll down to \"Quick add\" and choose Animate.css. Click the gear in the upper left hand corner of the JS box, then scroll down to \"Quick add\" and choose jQuery. Prove that Animate.css and jQuery are loaded properly. In the JS box, add the following code to make your h1 element bounce: <code>$(document).ready(function(){ $(\"h1\").addClass(\"animated bounce\"); });</code>.",
+          "Click the gear in the upper left hand corner of the CSS box, then scroll down to \"Quick add\" and choose Animate.css. Click the gear in the upper left hand corner of the JS box, then scroll down to \"Quick add\" and choose jQuery. Let's prove that Animate.css and jQuery are loaded properly. In the JS box, add the following code to make your h1 element bounce: <code>$(document).ready(function(){ $(\"h1\").addClass(\"animated bounce\"); });</code>.",
           ""
         ],
         [
diff --git a/seed/challenges/gear-up-for-success.json b/seed/challenges/gear-up-for-success.json
index b73404a129..382dc3b43a 100644
--- a/seed/challenges/gear-up-for-success.json
+++ b/seed/challenges/gear-up-for-success.json
@@ -36,7 +36,7 @@
         [
           "http://i.imgur.com/4GO4zcI.gif",
           "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
-          "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
+          "Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
           ""
         ]
       ],
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index bd3638725f..5b32a65023 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -82,7 +82,7 @@
           "https://github.com/settings/profile"
         ],
         [
-          "http://i.imgur.com/OXL3G3n.gif",
+          "http://i.imgur.com/pYk0wOk.gif",
           "A gif showing how you can star a GitHub repo.",
           "Go to Free Code Camp's open-source repository and \"star\" it. \"Starring\" is the GitHub equivalent of \"liking\" something.",
           "https://github.com/freecodecamp/freecodecamp"
diff --git a/server/views/coursewares/showStep.jade b/server/views/coursewares/showStep.jade
index fb375a83d3..274b9e72b3 100644
--- a/server/views/coursewares/showStep.jade
+++ b/server/views/coursewares/showStep.jade
@@ -6,7 +6,7 @@ block content
                     .thumbnail.challenge-step(class=index !== 0 ? 'hidden': '')
                         img.gif-block.img-center.img-responsive.thumbnail(src='#{step[0]}' alt='#{step[1]}')
                         .caption
-                            p.large-p= step[2]
+                            p.large-p!= step[2]
                         if step[3]
                             a.btn.btn-block.btn-primary.challenge-step-btn-action(id='#{index}' href='#{step[3]}' target='_blank') Open link in new tab
                         if index + 1 === description.length
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 7108bd05b4..18f3320315 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -14,7 +14,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
             li
                 a(href='//gitter.im/FreeCodeCamp/FreeCodeCamp', target='_blank') Chat
             li
-                a(href='/news') News
+                a(href='/news', target='_blank') News
             li
                 a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/Home', target='_blank') Wiki
             if !user

From d805e9caae264c6cbe6228061e64959c9f9f0b54 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 13 Oct 2015 10:12:26 -0700
Subject: [PATCH 090/140] additional improvements to basejumps

---
 seed/challenges/basejumps.json | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index 67a630d701..a65959e630 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -16,7 +16,7 @@
         [
           "http://i.imgur.com/F7i5Hhi.gif",
           "A gif showing how to fill out the new workspace form",
-          "Instead of starting from scratch, we recommend using Clementine.js, a full stack JavaScript \"boilerplate\" that already has some basic code written for you. On c9.io, give your workspace a name, then leave \"Template\" as custom and create your workspace from this GitHub url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
+          "Instead of starting from scratch, we recommend using Clementine.js, a full stack JavaScript \"boilerplate\" that already has some basic code written for you. Clementine.js has a detailed tutorial you can go through to build it yourself, but for now let's just clone its code. On c9.io, give your workspace a name, then leave \"Template\" as custom and create your workspace from this GitHub url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
           ""
         ],
         [
@@ -34,10 +34,7 @@
         [
           "http://i.imgur.com/sULwMlo.gif",
           "A gif showing you how to prep your environmental variables in your .env file.",
-          "Open your .env file and past this into it, then save it:",
-          "<code>GITHUB_KEY=</code>",
-          "<code>GITHUB_SECRET=</code>",
-          "<code>APP_URL=</code>",
+          "Open your .env file and paste this into it, then save it: <br><code>GITHUB_KEY=<br>GITHUB_SECRET=<br>APP_URL=</code>",
           ""
         ],
         [
@@ -61,7 +58,7 @@
         [
           "http://i.imgur.com/VqCmJOh.gif",
           "A gif showing you how to update the ajax-functions.js file with your c9.io preview URL.",
-          "Open app/common/ajax-functions.js and replace \"http://localhost:8080/\" with the URL from your clipboard (the URL from your preview tab).",
+          "Open <code>app/common/ajax-functions.js</code> and replace <code>http://localhost:8080/</code> with the URL from your clipboard (the URL from your preview tab).",
           ""
         ],
         [
@@ -117,7 +114,6 @@
         "<span class='text-info'>Objective:</span> Build a full stack JavaScript app that successfully reverse-engineers this: <a href='http://votingapp.herokuapp.com/' target='_blank'>http://votingapp.herokuapp.com/</a> and deploy it to Heroku.",
         "Note that for each Basejump, you should create a new GitHub repository and a new Heroku project. If you can't remember how to do this, revisit <a href='/challenges/get-set-for-basejumps'>http://freecodecamp.com/challenges/get-set-for-basejumps</a>.",
         "As you build your app, you should frequently commit changes to your codebase. You can do this by running <code>git commit -am \"your commit message\"</code>. Note that you should replace \"your commit message\" with a brief summary of the changes you made to your code.",
-        "You can push these new commits to GitHub by running <code>git push origin master</code>, and to Heroku by running <code>grunt --force && grunt buildcontrol:heroku</code>.",
         "Here are the specific User Stories you should implement for this Basejump:",
         "<span class='text-info'>User Story:</span> As an authenticated user, I can keep my polls and come back later to access them.",
         "<span class='text-info'>User Story:</span> As an authenticated user, I can share my polls with my friends.",

From 156d0247e91fa400038b7d42e8a82c1d81c977dd Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 13 Oct 2015 14:29:32 -0700
Subject: [PATCH 091/140] revert to old basejump.json

---
 seed/challenges/basejumps.json | 153 ++++++++++++---------------------
 1 file changed, 55 insertions(+), 98 deletions(-)

diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index a65959e630..b665d28622 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -5,106 +5,62 @@
     {
       "id": "bd7158d8c443eddfaeb5bcef",
       "title": "Get Set for Basejumps",
-      "challengeSeed": [],
+      "challengeSeed": ["128451852"],
       "description": [
-        [
-          "http://i.imgur.com/4IZjWZ3.gif",
-          "A gif showing how to create a c9.io account.",
-          "We recommend building our full stack Basejump challenges on c9.io, a powerful browser-based development environment. This save you hours of time that you would spend configuring your local computer to run Node.js and MongoDB - time you could instead spend coding. Create a c9.io account bu clicking the GitHub symbol in the upper right hand corner of the c9.io page. Click the big plus symbol to create a new workspace. Enter your email address when prompted.",
-          "http://c9.io"
-        ],
-        [
-          "http://i.imgur.com/F7i5Hhi.gif",
-          "A gif showing how to fill out the new workspace form",
-          "Instead of starting from scratch, we recommend using Clementine.js, a full stack JavaScript \"boilerplate\" that already has some basic code written for you. Clementine.js has a detailed tutorial you can go through to build it yourself, but for now let's just clone its code. On c9.io, give your workspace a name, then leave \"Template\" as custom and create your workspace from this GitHub url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/42m1vyr.gif",
-          "A gif showing you how to show hidden files.",
-          "Click the gear in the upper right corner of c9.io's file structure. Select \"show hidden files\".",
-          ""
-        ],
-        [
-          "http://i.imgur.com/qrE8xaK.gif",
-          "A gif showing you how to create a new file.",
-          "Right click and create a new file called <code>.env</code>.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/sULwMlo.gif",
-          "A gif showing you how to prep your environmental variables in your .env file.",
-          "Open your .env file and paste this into it, then save it: <br><code>GITHUB_KEY=<br>GITHUB_SECRET=<br>APP_URL=</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/BH2qLhB.gif",
-          "A gif showing you how to open c9.io's preview window.",
-          "Open up your application in a preview tab by clicking window > share > application > open.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/EIiaiPg.gif",
-          "A gif showing you how to creat ea GitHub app using c9.io's preview URL.",
-          "Create a GitHub app for authentication and choose an \"Application name\". For the homepage URL, paste the URL from your preview tab. You'll also paste the URL from your preview tab into \"Authorization callback URL\", then add to it: <code>auth/github/callback</code>",
-          "https://github.com/settings/applications/new"
-        ],
-        [
-          "http://i.imgur.com/drPlNaE.gif",
-          "A gif showing you how to transfer GitHub's key and secret over to your .env file, as well as your c9.io URL.",
-          "GitHub will create an app and present you with a Client ID and a Client Secret. Set your .env file's GITHUB_KEY equal to the Client ID, and set your .env file's GITHUB_SECRET equal to the Client Secret. Copy the URL from the your preview tab and paste it into your .env file as your APP_URL.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/VqCmJOh.gif",
-          "A gif showing you how to update the ajax-functions.js file with your c9.io preview URL.",
-          "Open <code>app/common/ajax-functions.js</code> and replace <code>http://localhost:8080/</code> with the URL from your clipboard (the URL from your preview tab).",
-          ""
-        ],
-        [
-          "http://i.imgur.com/bLXrt6P.gif",
-          "A gif showing you how to start mongoDB in c9.io's terminal.",
-          "In your terminal, start MongoDB by entering <code>mongod --smallfiles</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/TNygDfF.gif",
-          "A gif showing you how to open a new tab in c9.io's terminal.",
-          "Open a new terminal tab with the + button above your terminal, then run <code>npm install</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/NYk4VeS.gif",
-          "A gif showing you how to navigate to your preview tab and sign in to your new Clementine.js app.",
-          "run <code>node server.js</code> to start the server. Refresh your preview tab. You should see the Clementine.js logo. Click \"sign in\" and accept GitHub's prompt to authorize the application.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/hA2MCee.gif",
-          "A gif showing you how to use Clementine.js's simple demo app.",
-          "Click the \"click me\" button and you'll see that it increments the number clicks. Click the profile button and you'll see that it has your GitHub information.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/Q8IfdQj.gif",
-          "A gif showing you how to create a commit on c9.io, then create a GitHub repository and push your code up to it.",
-          "Create a commit by typing <code>git add . && git commit -m\"first commit\"</code>. Then open GitHub in a new tab and click \"New repository\". Name your repository, then click \"Create repository\". Then copy its .git URL. Return to c9.io's terminal and set your GitHub remote URL: <code>git remote set-url origin</code> followed by the URL you copied from GitHub. Run <code>git push origin master</code>. Now tab back to GitHub and refresh, and you'll see that your code is now on GitHub.",
-          ""
-        ]
+        "<span class='text-info'>Objective:</span> Get the MEAN stack running on Cloud 9, push your code to GitHub, and deploy it to Heroku.",
+        "We'll build our Basejumps on Cloud 9, a powerful online code editor with a full Ubuntu Linux workspace, all running in the cloud.",
+        "If you don't already have Cloud 9 account, create one now at <a href='http://c9.io' target='_blank'>http://c9.io</a>.",
+        "Now let's get your development environment ready for a new Angular-Fullstack application provided by Yeoman.",
+        "Open up <a href='http://c9.io' target='_blank'>http://c9.io</a> and sign in to your account.",
+        "Click on the \"+\" icon at the top right of the c9.io page to create a new workspace.",
+        "Give your workspace a name and an optional description.",
+        "Choose Node.js in the selection area below the name field.",
+        "Click the \"Create workspace\" button.",
+        "Once C9 builds and loads your workspace, you should see a terminal window in the lower right hand corner. In this window use the following commands. You don't need to know what these mean at this point.",
+        "Never run this command on your local machine. But in your Cloud 9 terminal window, run: <code>rm -rf * && echo \"export NODE_PATH=$NODE_PATH:/home/ubuntu/.nvm/v0.10.35/lib/node_modules\" >> ~/.bashrc && source ~/.bashrc && npm install -g yo grunt grunt-cli generator-angular-fullstack && yo angular-fullstack</code>",
+        "Yeoman will prompt you to answer some questions. Answer them like this:",
+        "What would you like to write scripts with? <span class='text-success'>JavaScript</span>",
+        "What would you like to write markup with? <span class='text-success'>HTML</span>",
+        "What would you like to write stylesheets with? <span class='text-success'>CSS</span>",
+        "What Angular router would you like to use? <span class='text-success'>ngRoute</span>",
+        "Would you like to include Bootstrap? <span class='text-success'>Yes</span>",
+        "Would you like to include UI Bootstrap? <span class='text-success'>Yes</span>",
+        "Would you like to use MongoDB with Mongoose for data modeling? <span class='text-success'>Yes</span>",
+        "Would you scaffold out an authentication boilerplate? <span class='text-success'>Yes</span>",
+        "Would you like to include additional oAuth strategies? <span class='text-success'>Twitter</span>",
+        "Would you like to use socket.io? <span class='text-success'>No</span>",
+        "May bower anonymously report usage statistics to improve the tool over time? (Y/n) <span class='text-success'>Y</span>",
+        "You may get an error similar to <code> ERR! EEXIST, open ‘/home/ubuntu/.npm</code>. This is caused when Cloud9 runs out of memory and kills an install. If you get this, simply re-run this process with the command <code>yo angular-fullstack</code>. You will then be asked a few questions regarding the re-install. Answer them as follows:",
+        "Existing .yo-rc configuration found, would you like to use it? (Y/n) <span class='text-success'>Y</span>",
+        "Overwrite client/favicon.ico? (Ynaxdh) <span class='text-success'>Y</span>",
+        "To finish the installation run the commands: <code>bower install && npm install</code>",
+        "To start MongoDB, run the following commands in your terminal: <code>mkdir data && echo 'mongod --bind_ip=$IP --dbpath=data --nojournal --rest \"$@\"' > mongod && chmod a+x mongod && ./mongod</code>",
+        "You will want to open up a new terminal to work from by clicking on the + icon and select New Terminal",
+        "Start the application by running the following command in your new terminal window: <code>grunt serve</code>",
+        "Wait for the following message to appear: <code>xdg-open: no method available for opening 'http://localhost:8080' </code>. Now you can open the internal Cloud9 browser. To launch the browser select Preview in the toolbar then select the dropdown option Preview Running Application.",
+        "Turn the folder in which your application is running into a Git repository by running the following commands: <code>git init && git add . && git commit -am 'initial commit'</code>.",
+        "Now we need to add your GitHub SSH key to c9.io. Click the \"Add-on Services\" button in the lower left of your C9 dashboard. Click \"activate\" next to the GitHub icon.",
+        "A pop up will appear. Allow access to your account.",
+        "While still on the dashboard, under “Account Settings”, click the link for \"Show your SSH key\". Copy the key to you clipboard.",
+        "Sign in to <a href='http://github.com' target='_blank'>http://github.com</a> and navigate to the GitHub SSH settings page. Click the \"Add SSH Key\". Give your key the title \"cloud 9\". Paste your SSH Key into the \"Key\" box, then click \"Add Key\".",
+        "Create a new GitHub repository by  and clicking on the + button next to your username in the upper-right hand side of your screen, then selecting \"New Repository\".",
+        "Enter a project name, then click the \"Create Repository\" button.",
+        "Find the \"...or push an existing repository from the command line\" section and click the Copy to Clipboard button beside it.",
+        "Paste the commands from your clipboard into the Cloud9 terminal prompt. This will push your changes to your repository on Cloud 9 up to GitHub.",
+        "Check back on your GitHub profile to verify the changes were successfully pushed up to GitHub.",
+        "Now let's push your code to Heroku. If you don't already have a Heroku account, create one at <a href='http://heroku.com' target='_blank'>http://heroku.com</a>. You shouldn't be charged for anything, but you will need to add your credit card information to your Heroku before you will be able to use Heroku's free MongoLab add on.",
+        "Before you publish to Heroku, you should free up as much memory as possible on Cloud9. In each of the Cloud9 terminal prompt tabs where MongoDB and Grunt are running, press the <code>control + c</code> hotkey to shut down these processes.",
+        "Run the following command in a Cloud9 terminal prompt tab: <code>npm install grunt-contrib-imagemin --save-dev && npm install --save-dev && heroku login</code>. At this point, the terminal will prompt you to log in to Heroku from the command line.",
+        "Now run <code>yo angular-fullstack:heroku</code>. You can choose a name for your Heroku project, or Heroku will create a random one for you. You can choose whether you want to deploy to servers the US or the EU.",
+        "Set the config flag for your Heroku environment and add MongoLab for your MongoDB instance by running the following command: <code>cd ~/workspace/dist && heroku config:set NODE_ENV=production && heroku addons:add mongolab</code>.",
+        "As you build your app, you should frequently commit changes to your codebase. Make sure you're in the <code>~/workspace</code> directory by running <code>cd ~/workspace</code>. Then you can use this code to stage the changes to your changes and commit them: <code>git commit -am \"your commit message\"</code>. Note that you should replace \"your commit message\" with a short summary of the changes you made to your code, such as \"added a records controller and corresponding routes\".",
+        "You can push these new commits to GitHub by running <code>git push origin master</code>, and to Heroku by running <code>grunt --force && grunt buildcontrol:heroku</code>.",
+        "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out: <a href='https://github.com/clnhll/guidetobasejumps' target='_blank'>https://github.com/clnhll/guidetobasejumps</a>.",
+        "Now you're ready to move on to your first Basejump. Click the \"I've completed this challenge\" and move on."
       ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "",
-      "descriptionEs": [],
-      "namePt": "",
-      "descriptionPt": []
+      "type": "waypoint",
+      "challengeType": 2,
+      "tests": []
     },
     {
       "id": "bd7158d8c443eddfaeb5bdef",
@@ -114,6 +70,7 @@
         "<span class='text-info'>Objective:</span> Build a full stack JavaScript app that successfully reverse-engineers this: <a href='http://votingapp.herokuapp.com/' target='_blank'>http://votingapp.herokuapp.com/</a> and deploy it to Heroku.",
         "Note that for each Basejump, you should create a new GitHub repository and a new Heroku project. If you can't remember how to do this, revisit <a href='/challenges/get-set-for-basejumps'>http://freecodecamp.com/challenges/get-set-for-basejumps</a>.",
         "As you build your app, you should frequently commit changes to your codebase. You can do this by running <code>git commit -am \"your commit message\"</code>. Note that you should replace \"your commit message\" with a brief summary of the changes you made to your code.",
+        "You can push these new commits to GitHub by running <code>git push origin master</code>, and to Heroku by running <code>grunt --force && grunt buildcontrol:heroku</code>.",
         "Here are the specific User Stories you should implement for this Basejump:",
         "<span class='text-info'>User Story:</span> As an authenticated user, I can keep my polls and come back later to access them.",
         "<span class='text-info'>User Story:</span> As an authenticated user, I can share my polls with my friends.",

From 1b784a70ae820d6c765b38a104d55de2b7f0a494 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 13 Oct 2015 15:00:46 -0700
Subject: [PATCH 092/140] Fix typo

---
 seed/challenges/gear-up-for-success.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/gear-up-for-success.json b/seed/challenges/gear-up-for-success.json
index 382dc3b43a..00b6521bf6 100644
--- a/seed/challenges/gear-up-for-success.json
+++ b/seed/challenges/gear-up-for-success.json
@@ -88,7 +88,7 @@
         [
           "http://i.imgur.com/Og1ifsn.gif",
           "A gif showing how you can commit to a goal for your Free Code Camp studies and pledge a monthly donation to a nonprofit to give you external motivation to reach that goal.",
-          "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. give you external motivation in your quest to learn to code, as well as the opportunity to help nonprofits right away. Choose your goal, choose a monthly donation. When you click \"commit\", the nonprofit's donate page will open in a new tab. You can change your committment or stop it at any time.",
+          "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. give you external motivation in your quest to learn to code, as well as the opportunity to help nonprofits right away. Choose your goal, choose a monthly donation. When you click \"commit\", the nonprofit's donate page will open in a new tab. You can change your commitment or stop it at any time.",
           "/commit"
         ]
       ],

From b4417a4f4d566a62e7d301559f58861d0be9e66d Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 13 Oct 2015 20:46:20 -0700
Subject: [PATCH 093/140] fix diff array should be free of duplicates

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

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index 5a4cf71a59..248382e6f3 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -68,7 +68,7 @@
         "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]), [\"piglet\", 4], 'message: <code>[1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]</code> should return <code>[\"piglet\", 4]</code>.');",
         "assert.deepEqual(diff([], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]), [\"snuffleupagus\", \"cookie monster\", \"elmo\"], 'message: <code>[], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code> should return <code>[\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code>.');",
         "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: <code>[1, \"calf\", 3, \"piglet\"], [7, \"filly\"]</code> should return <code>[1, \"calf\", 3, \"piglet\", 7, \"filly\"]</code>.');",
-        "assert.deepEqual(diff([1, 2, 3, 3], [1]), [2, 3, 3], 'message: <code>[1, 2, 3, 3], [1]</code> should return <code>[2, 3, 3]</code>.');"
+        "assert.deepEqual(diff([1, 2, 3, 3], [1]), [2, 3], 'message: <code>[1, 2, 3, 3], [1]</code> should return <code>[2, 3]</code>.');"
       ],
       "MDNlinks": [
         "Comparison Operators",

From df56b85cd55110669e773e3132e2baa91f8e5370 Mon Sep 17 00:00:00 2001
From: Michael Kebe <michael.kebe@gmail.com>
Date: Wed, 14 Oct 2015 22:45:50 +0200
Subject: [PATCH 094/140] Added more tests to Bonfire: Validate US Telephone
 Numbers

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

diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index e6dc2474c3..8ff025e2fe 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -40,7 +40,9 @@
         "assert(telephoneCheck(\"27576227382\") === false, 'message: <code>telephoneCheck(\"27576227382\")</code> should return false.');",
         "assert(telephoneCheck(\"(275)76227382\") === false, 'message: <code>telephoneCheck(\"(275)76227382\")</code> should return false.');",
         "assert(telephoneCheck(\"2(757)6227382\") === false, 'message: <code>telephoneCheck(\"2(757)6227382\")</code> should return false.');",
-        "assert(telephoneCheck(\"2(757)622-7382\") === false, 'message: <code>telephoneCheck(\"2(757)622-7382\")</code> should return false.');"
+        "assert(telephoneCheck(\"2(757)622-7382\") === false, 'message: <code>telephoneCheck(\"2(757)622-7382\")</code> should return false.');",
+        "assert(telephoneCheck(\"555)-555-5555\") === false, 'message: <code>telephoneCheck(\"555)555-5555\")</code> should return false.');",
+        "assert(telephoneCheck(\"(555-555-5555\") === false, 'message: <code>telephoneCheck(\"(555-555-5555\")</code> should return false.');"
       ],
       "challengeSeed": [
         "function telephoneCheck(str) {",

From 3ae7da38a3c781b06e84be56f1c965ce95ee6380 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 14 Oct 2015 20:41:36 -0700
Subject: [PATCH 095/140] Remove rev helper use in ssl redirect

---
 server/views/partials/small-head.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/views/partials/small-head.jade b/server/views/partials/small-head.jade
index 2b335ab9e7..687fa3a379 100644
--- a/server/views/partials/small-head.jade
+++ b/server/views/partials/small-head.jade
@@ -1,7 +1,7 @@
 script(src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js")
 script(src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js")
 link(rel='stylesheet', href='/bower_components/font-awesome/css/font-awesome.min.css')
-link(rel='stylesheet', href=rev('/css', 'main.css'))
+link(rel='stylesheet', href='/css/main.css')
 link(rel='stylesheet', href='/css/Vimeo.css')
 // End **REQUIRED** includes
 

From aceb1dd9e654734c4663236f5ead678f7f02062e Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 14 Oct 2015 20:51:38 -0700
Subject: [PATCH 096/140] Change order of information in morgan reporting

---
 server/middleware.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/middleware.json b/server/middleware.json
index 66a1d0bd52..cea72e61c4 100644
--- a/server/middleware.json
+++ b/server/middleware.json
@@ -15,7 +15,7 @@
   "initial": {
     "compression": {},
     "morgan": {
-      "params": "dev"
+      "params": ":status :method :response-time ms - :url"
     }
   },
   "session": {

From 7c0d801d6396a93a08020d56c41aa80fd24204a3 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 14 Oct 2015 21:26:22 -0700
Subject: [PATCH 097/140] Add google analytics tracking

---
 client/main.js                            |  3 +++
 server/views/coursewares/showBonfire.jade |  2 +-
 server/views/partials/scripts.jade        | 16 ++++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/client/main.js b/client/main.js
index af32484411..914e9376d4 100644
--- a/client/main.js
+++ b/client/main.js
@@ -2,6 +2,8 @@ var main = window.main || {};
 
 main.mapShareKey = 'map-shares';
 
+main.ga = window.ga || function() {};
+
 var lastCompleted = typeof lastCompleted !== 'undefined' ?
   lastCompleted :
   '';
@@ -451,6 +453,7 @@ $(document).ready(function() {
       '&redirect_uri=http%3A%2F%2Ffreecodecamp%2Ecom%2Fmap';
 
     setMapShare(challengeBlockName);
+    main.ga('send', 'event', 'FB_LINK', 'SHARE', 'Facebook map share');
     window.location.href = link;
   });
 });
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index e64424e1ac..1768bd4274 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -106,7 +106,7 @@ block content
                       if (user)
                           #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter)
                           if (user.progressTimestamps.length > 2)
-                              a.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript")
+                              a.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript", onclick="ga('send', 'event', 'twitter', 'share', 'challenge completion share');")
                                   i.fa.fa-twitter &thinsp;
                                       = phrase
                       else
diff --git a/server/views/partials/scripts.jade b/server/views/partials/scripts.jade
index 17c2d178bd..c88702daea 100644
--- a/server/views/partials/scripts.jade
+++ b/server/views/partials/scripts.jade
@@ -1,3 +1,11 @@
+script.
+    (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-55446531-1', 'auto');
+    ga('require', 'displayfeatures');
+    ga('send', 'pageview');
 script(src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js")
 script.
     window.jQuery || document.write('<script src="/bower_components/jquery/dist/jquery.min.js"><\/script>');
@@ -29,11 +37,3 @@ script(src=rev('/js', 'main.js'))
 script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js")
 script(src="/bower_components/ramda/dist/ramda.min.js")
 script(src='/bower_components/lightbox2/dist/js/lightbox.min.js')
-script.
-    (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-55446531-1', 'auto');
-    ga('require', 'displayfeatures');
-    ga('send', 'pageview');

From cf45d2b01fc9e7cf5c7cfb190e0539d6ecf50a4c Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 14 Oct 2015 21:42:29 -0700
Subject: [PATCH 098/140] update landing page and stories

---
 client/less/main.less               |   8 +-
 server/resources/testimonials.json  | 193 ++++++++++++++--------------
 server/views/home.jade              |  22 ++--
 server/views/resources/stories.jade |   3 +-
 4 files changed, 118 insertions(+), 108 deletions(-)

diff --git a/client/less/main.less b/client/less/main.less
index 00f426e55b..4340350da7 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -495,10 +495,12 @@ thead {
 }
 
 .testimonial-copy {
-  font-size: 20px;
-  text-align: center;
+  text-align: justify;
+  font-size: 18px !important;
+  margin-left: 20px;
+  margin-right: 20px;
   @media (min-width: 991px) and (max-width: 1199px) {
-    height: 120px;
+    height: 140px;
   }
   @media (min-width: 1200px) {
     height: 90px;
diff --git a/server/resources/testimonials.json b/server/resources/testimonials.json
index a2d0a72622..2904452edd 100644
--- a/server/resources/testimonials.json
+++ b/server/resources/testimonials.json
@@ -1,4 +1,18 @@
 [
+  {
+    "camper": "Meta Hirschl",
+    "quote": "By building a robust and highly functional web app I was able to not only increase my confidence but was able to show potential employers what I was able to create. Both were huge for me and led me to getting a fantastic job.",
+    "github": "MetaCoderHirschl",
+    "linkedin": "https://www.linkedin.com/profile/view?id=ADEAAAKX2fEBfeZ1GVdOh-c0zzkYZKw38o8qzow&authType=NAME_SEARCH&authToken=hfRS&locale=en_US&srchid=147930701444634954491&srchindex=1&srchtotal=1&trk=vsrp_people_res_photo&trkInfo=VSRPsearchId%3A147930701444634954491%2CVSRPtargetId%3A43506161%2CVSRPcmpt%3Aprimary%2CVSRPnm%3Atrue%2CauthType%3ANAME_SEARCH",
+    "image": "https://media.licdn.com/media/p/6/005/0ac/31c/05f0e58.jpg"
+  },
+  {
+    "camper": "Branden Byers",
+    "quote": "My goal was to become employed by the end of 2015. Instead, I ended up with a job at the beginning of 2015. This was directly related to my work at Free Code Camp.",
+    "github": "brandenbyers",
+    "linkedin": "https://www.linkedin.com/in/brandenbyers",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/4/005/0a0/1e4/378908c.jpg"
+  },
   {
     "camper": "Bruna Torman Reseres Franasa",
     "quote": "I’m now receiving offers for internships. I have no experience in IT, but now good things are happening!",
@@ -7,11 +21,25 @@
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/8/005/09e/16e/32c3d3f.jpg"
   },
   {
-    "camper": "Branden Byers",
-    "quote": "My goal was to become employed by the end of 2015. Instead, I ended up with a job at the beginning of 2015. This was directly related to my work at Free Code Camp.",
-    "github": "brandenbyers",
-    "linkedin": "https://www.linkedin.com/in/brandenbyers",
-    "image": "https://pbs.twimg.com/profile_images/539515557184167936/JqJXzV9x.jpeg"
+    "camper": "Maxim Orlov",
+    "quote": "I started Free Code Camp with zero knowledge of web development. 6 months later, I landed my first job as a back end engineer.",
+    "github": "Maximization",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAo83nwBF57LpD9mZlm5dH6OcovOpYKPs3k&authType=NAME_SEARCH&authToken=yG4h&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A171761276%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635014777%2Ctas%3AMaxim%20Orlov",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAALJAAAAJGI5ZGFhODA0LWI4MzAtNDU5Ny04NjU3LTIwMjdhMmIxYjFjNg.jpg"
+  },
+  {
+    "camper": "Alexander Black, Jr.",
+    "quote": "My work on a nonprofit project gave me the opportunity to learn how to build Chrome extensions and showcase my skills as a full-stack developer.",
+    "github": "alexblackjr",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA553L4BgfgBR-M9RQc7x5matd6FUx3a6-I&authType=NAME_SEARCH&authToken=TW_a&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A242867390%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444634592237%2Ctas%3Aalexander%20black%20jr",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAANmAAAAJDQ1ZWIxMmVjLTAwNjUtNDFlNS04OWVhLTk4ZGZkNmViODkxNw.jpg"
+  },
+  {
+    "camper": "Cristiane Henriques",
+    "quote": "I am getting more work contacts after including Free Code Camp on my CV and my LinkedIn.",
+    "github": "CrisHenriques",
+    "linkedin": "https://www.linkedin.com/in/crishenriques",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAKEAAAAJGFjMTBjZWY5LTE2ZWMtNGU2OC05MTk3LTdkZjUyYWI1NjA5NQ.jpg"
   },
   {
     "camper": "Viktor Bakurin",
@@ -20,54 +48,12 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAq6G3QBA1DIwFZGrS4DGqDzBDTzFjrbNQo&authType=NAME_SEARCH&authToken=QoJ0&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A179968884%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635040141%2Ctas%3AViktor%20Bakurin",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAM3AAAAJDVkZThkNjk3LWY4MTgtNGNmMS05MTZkLTkxZDljOGEzMGM5Nw.jpg"
   },
-  {
-    "camper": "Maxim Orlov",
-    "quote": "Before joining the community I had zero knowledge of web development and 6 months and 3 days later I had landed my first job as a backend engineer for a tech start-up. My career has just started and thanks to Free Code Camp the dream of becoming a prominent figure in the software industry is within reach.",
-    "github": "Maximization",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAo83nwBF57LpD9mZlm5dH6OcovOpYKPs3k&authType=NAME_SEARCH&authToken=yG4h&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A171761276%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635014777%2Ctas%3AMaxim%20Orlov",
-    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAALJAAAAJGI5ZGFhODA0LWI4MzAtNDU5Ny04NjU3LTIwMjdhMmIxYjFjNg.jpg"
-  },
-  {
-    "camper": "Alexander Black, Jr.",
-    "quote": "Work with the Kopernik nonprofit gave us the opportunity to learn how to build Chrome extensions and showcase our skills a full-stack developers.",
-    "github": "alexblackjr",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA553L4BgfgBR-M9RQc7x5matd6FUx3a6-I&authType=NAME_SEARCH&authToken=TW_a&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A242867390%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444634592237%2Ctas%3Aalexander%20black%20jr",
-    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAANmAAAAJDQ1ZWIxMmVjLTAwNjUtNDFlNS04OWVhLTk4ZGZkNmViODkxNw.jpg"
-  },
-  {
-    "camper": "Travis Wouters",
-    "quote": "Free Code Camp helped me add skillsets to my resume that show experience instead of knowledge without practical application.",
-    "github": "",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAABHP0YBddxsmaf2OghV2jAy17RVMhig4RM&authType=NAME_SEARCH&authToken=a7pC&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A4669254%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444634846844%2Ctas%3ATravis%20Wouters",
-    "image": "https://media.licdn.com/media/p/8/005/07d/2f1/1792a44.jpg"
-  },
-  {
-    "camper": "Meta Hirschl",
-    "quote": "By building a robust and highly functional web app I was able to not only increase my confidence but was able to show potential employers what I was able to create. Both were huge for me and led me to getting a fantastic job.",
-    "github": "MetaCoderHirschl",
-    "linkedin": "https://www.linkedin.com/profile/view?id=ADEAAAKX2fEBfeZ1GVdOh-c0zzkYZKw38o8qzow&authType=NAME_SEARCH&authToken=hfRS&locale=en_US&srchid=147930701444634954491&srchindex=1&srchtotal=1&trk=vsrp_people_res_photo&trkInfo=VSRPsearchId%3A147930701444634954491%2CVSRPtargetId%3A43506161%2CVSRPcmpt%3Aprimary%2CVSRPnm%3Atrue%2CauthType%3ANAME_SEARCH",
-    "image": "https://media.licdn.com/media/p/6/005/0ac/31c/05f0e58.jpg"
-  },
-  {
-    "camper": "Geoff Storbeck",
-    "quote": "I've been able to build tools that has helped moved my current career further and has opened up many more doors in the field.",
-    "github": "storbeck",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAdVQZYBHPYLt5efKwqZmiDM5SqIdH0_AR4&authType=NAME_SEARCH&authToken=EDd-&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A123027862%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635255807%2Ctas%3AGeoff%20Storbeck%09",
-    "image": "https://media.licdn.com/media/p/1/000/124/306/339eee6.jpg"
-  },
-  {
-    "camper": "Jonathan Lucas",
-    "quote": "Free Code Camp has been nothing but supportive and helpful, taking me from a rather basic knowledge of front end technologies to a better, more complete understanding from a full stack perspective.",
-    "github": "jonslucas",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAATn9H4BI7BP7MBpZ0NR1EvldkWTvAdGy2w&authType=NAME_SEARCH&authToken=hLmG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A82310270%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635490853%2Ctas%3AJon%20Lucas",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAIcAAAAJGMxMjY3MmEwLTM0ODgtNGU3OS1hZjFiLTJjZjNhMDM3YTUyZQ.jpg"
-  },
   {
     "camper": "Ashley Drake",
-    "quote": "I just accepted a job offer as an engineer. I started Free Code Camp to switch careers and it has enabled me to do just that. The projects and community are amazing and made all of this work easier and more fun.",
+    "quote": "Free Code Camp helped me get my first engineering job. This amazing community made my career switch a lot easier and more fun.",
     "github": "aldraco",
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAABcdBycB1iVHvcW7N3yVK-18ES7Nrxx2jbE&authType=NAME_SEARCH&authToken=gKNN&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A387778343%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635725853%2Ctas%3Aashley%20",
-    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAAKBAAAAJDEwYmY4ZDMwLTc3YzAtNDc2Yi04M2EzLTBlOWY0MzA4NTM5Yg.jpg"
+    "image": "http://i.imgur.com/xzDoJef.jpg"
   },
   {
     "camper": "Brian Grant",
@@ -83,6 +69,13 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA79qIYB_RHmvOP59S6VPK3Lm06oG8fM6dw&authType=NAME_SEARCH&authToken=PfeR&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A251504774%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444636112016%2Ctas%3AThomas%20%20Izen",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAMaAAAAJGRjZTQ4MTdmLTZmZGItNGFhNS1hNTE0LWJmYjFhZDY3YmM3MQ.jpg"
   },
+  {
+    "camper": "Lori Becker",
+    "quote": "After graduating with a Masters degree in computer science, I could not share any of my code with employers (university policy: fear of aiding cheating). With FreeCodeCamp, I was able to develop a small portfolio.",
+    "github": "LCBecker",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADrtuwBOA_0ihkKIbUFXoXskXikQT9uVeo&authType=NAME_SEARCH&authToken=sctO&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A15447788%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907195702%2Ctas%3Alori",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/1/005/080/392/295a574.jpg"
+  },
   {
     "camper": "Robert Trammel",
     "quote": "I'm working a job integrating JavaScript into FileMaker and doing some custom web publishing for a school district. I've also have job offers from Apple and a few technology firms around the country. If it wasn't for Free Code Camp, I'd still be in the dark with some really awesome but irrelevant skills.",
@@ -98,11 +91,11 @@
     "image": "https://media.licdn.com/media/p/8/000/2aa/36c/2d218a8.jpg"
   },
   {
-    "camper": "Normandy Real",
-    "quote": "I'm doing Free Code Camp to transition from mainframe programming to front end development.",
-    "github": "mandyreal",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAdebIIBHfcSRnxGI-j6g5y6crfOXSg55Dc&authType=NAME_SEARCH&authToken=xLNy&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A123628674%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444636619442%2Ctas%3ANormandy%20Real",
-    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAAMrAAAAJDAxMmE0ZWI1LWU0MjctNDRjYS1hNjdkLTYwZTI5NjUxMDhjYw.jpg"
+    "camper": "Andrea Goulet",
+    "quote": "Before enrolling in Free Code Camp, I was nervous when people asked me, \"Do you code?\", Now, I answer with a confident \"YES!\"",
+    "github": "andreagoulet",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAA4KWYB-mCMwEU3LvDHXt6H0rVHbBvszq0&authType=NAME_SEARCH&authToken=hUBG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A3680614%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907386771%2Ctas%3Aandrea%20go",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAMyAAAAJDI1MWU4OWU4LTZmNTAtNGFmMS1iYzcxLTA5Y2IwYzIyMWIxYQ.jpg"
   },
   {
     "camper": "David McGill",
@@ -126,11 +119,11 @@
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/000/268/01a/0492529.jpg"
   },
   {
-    "camper": "Lori Becker",
-    "quote": "After graduating with a Masters degree in computer science, I could not share any of my code with employers (university policy: fear of aiding cheating). With FreeCodeCamp, I was able to develop a small portfolio.",
-    "github": "LCBecker",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADrtuwBOA_0ihkKIbUFXoXskXikQT9uVeo&authType=NAME_SEARCH&authToken=sctO&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A15447788%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907195702%2Ctas%3Alori",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/1/005/080/392/295a574.jpg"
+    "camper": "Jonathan Lucas",
+    "quote": "Free Code Camp has been nothing but supportive and helpful, taking me from a rather basic knowledge of front end technologies to a better, more complete understanding from a full stack perspective.",
+    "github": "jonslucas",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAATn9H4BI7BP7MBpZ0NR1EvldkWTvAdGy2w&authType=NAME_SEARCH&authToken=hLmG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A82310270%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635490853%2Ctas%3AJon%20Lucas",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAIcAAAAJGMxMjY3MmEwLTM0ODgtNGU3OS1hZjFiLTJjZjNhMDM3YTUyZQ.jpg"
   },
   {
     "camper": "Alex Dixon",
@@ -238,18 +231,11 @@
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAL8AAAAJDliMGU0MTk0LWQ3YTUtNDY0NS1hMTg1LTdhN2Q1NTBlMzA5MQ.jpg"
   },
   {
-    "camper": "Nicholas Slaven",
-    "quote": "Free Code Camp has given me the courage to open the door to the idea of programming for a career.",
-    "github": "nslaven22",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA5HGyIBmpNcXY_tfHBkWxXI6OtwsFAeHRQ&authType=NAME_SEARCH&authToken=IIqr&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A239541026%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907370759%2Ctas%3Aslaven",
-    "image": "https://media.licdn.com/media/p/3/000/222/0d1/2606078.jpg"
-  },
-  {
-    "camper": "Andrea Goulet",
-    "quote": "Before enrolling in Free Code Camp, I was nervous when people asked me, \"Do you code?\", Now, I answer with a confident \"YES!\"",
-    "github": "andreagoulet",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAA4KWYB-mCMwEU3LvDHXt6H0rVHbBvszq0&authType=NAME_SEARCH&authToken=hUBG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A3680614%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907386771%2Ctas%3Aandrea%20go",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAMyAAAAJDI1MWU4OWU4LTZmNTAtNGFmMS1iYzcxLTA5Y2IwYzIyMWIxYQ.jpg"
+    "camper": "Rhonadale Florentino",
+    "quote": "I can now confidently tell clients that I can design their website.",
+    "github": "None Given",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAI53oUBmy6MPKp1UeHxBy3_y0cyTS4bWow&authType=NAME_SEARCH&authToken=gz62&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A37346949%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907434768%2Ctas%3Arhona",
+    "image": "https://media.licdn.com/media/p/7/005/0aa/319/1aaa08f.jpg"
   },
   {
     "camper": "Justin Clay Lane",
@@ -265,13 +251,6 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAhIipMB6vAXaratEs0MtUd3GgyYm70cvbE&authType=NAME_SEARCH&authToken=pbTj&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A138971795%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907423626%2Ctas%3Aangsh",
     "image": "https://media.licdn.com/media/AAEAAQAAAAAAAAKPAAAAJGRjMmQwZjY5LTViMmUtNDQyZS04Y2Y3LTRhYjZiYWJlZDQzNw.jpg"
   },
-  {
-    "camper": "Rhonadale Florentino",
-    "quote": "I can now confidently tell clients that I can design their website.",
-    "github": "None Given",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAI53oUBmy6MPKp1UeHxBy3_y0cyTS4bWow&authType=NAME_SEARCH&authToken=gz62&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A37346949%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907434768%2Ctas%3Arhona",
-    "image": "https://media.licdn.com/media/p/7/005/0aa/319/1aaa08f.jpg"
-  },
   {
     "camper": "Nick Galluzzo",
     "quote": "I currently work in a support role for a tech startup (www.knackhq.com). The more I learn about JavaScript, the more I’m able to contribute to a product I really believe in!",
@@ -286,6 +265,13 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAOISlMBAi43m1SG-xM_S2B8Vy05yiQz5rE&authType=NAME_SEARCH&authToken=AY6E&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A59263571%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907488270%2Ctas%3Agenav",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAWUAAAAJDc2ODU4MjVkLTlmMDUtNDM4My05OTY2LTliMTQxNzFlZmY0OQ.jpg"
   },
+  {
+    "camper": "Nicholas Slaven",
+    "quote": "Free Code Camp has given me the courage to open the door to the idea of programming for a career.",
+    "github": "nslaven22",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA5HGyIBmpNcXY_tfHBkWxXI6OtwsFAeHRQ&authType=NAME_SEARCH&authToken=IIqr&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A239541026%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907370759%2Ctas%3Aslaven",
+    "image": "https://media.licdn.com/media/p/3/000/222/0d1/2606078.jpg"
+  },
   {
     "camper": "Tim Stauffer",
     "quote": "I found Free Code Camp more helpful than my MS degree, so I quit college. Learning so much. Also saving $50,000.",
@@ -293,6 +279,13 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAADVcVIBz8UCNjQKl2GUy9ka8UGnQXAXAYw&authType=NAME_SEARCH&authToken=7Hkg&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A13988178%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907522559%2Ctas%3Astauffer",
     "image": "https://avatars1.githubusercontent.com/u/3429096?v=3&s=460"
   },
+  {
+    "camper": "Marquina M Iliev-Piselli",
+    "quote": "I’m re-designing a site for my full-time job.",
+    "github": "Marquina",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAACYvVUBTuu8dNRHthN1TFiyk137PLDqnv4&authType=NAME_SEARCH&authToken=V_iG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A10009941%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907639677%2Ctas%3Amarquin",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAZLAAAAJDQ5Nzg4MjJmLWUyMjQtNDI5Ny05NmY5LTE5Yjc1Y2Q1YWFhOA.jpg"
+  },
   {
     "camper": "Pete Considine",
     "quote": "The guided and structured lessons have been really helpful, as has the relatively slow pace that new concepts are introduced. I had been taking a Udemy course and it really seemed to be skimming the surface of JavaScript in the interest of \"getting to everything.\"",
@@ -307,13 +300,6 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAbdUsIBApacWEmL7CIxe2q7aevMn7aQvmQ&authType=NAME_SEARCH&authToken=a_zs&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A115167938%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907569985%2Ctas%3Akhatra",
     "image": "https://avatars0.githubusercontent.com/u/11299138?v=3&s=460"
   },
-  {
-    "camper": "Miranda Bashore",
-    "quote": "I want to be able to freelance and create dynamic websites. Free Code Camp makes that more of a reality for me, as I cannot afford an expensive bootcamp while getting my Master’s degree.",
-    "github": "DutchBay",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA8KmJMBTtvvgJzjeAUo_YOssh2yLZZlvlk&authType=NAME_SEARCH&authToken=fWay&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A252352659%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907584953%2Ctas%3Amiranda",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/005/078/187/0ca3604.jpg"
-  },
   {
     "camper": "Marcus Lyons",
     "quote": "Free Code Camp has helped me gain the confidence to automate part of my work responsibilities. I was able to use skills I learned from Free Code Camp to help with writing a bash script to search through mobile app database log files to find errors.",
@@ -342,13 +328,6 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAVdU1MBFFiei4ZYNImnVDcR3H_EiuS6qLY&authType=NAME_SEARCH&authToken=TlgU&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A90002259%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907626390%2Ctas%3Acameron%20",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/6/005/0a4/178/079a07b.jpg"
   },
-  {
-    "camper": "Marquina M Iliev-Piselli",
-    "quote": "I’m re-designing a site for my full-time job.",
-    "github": "Marquina",
-    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAACYvVUBTuu8dNRHthN1TFiyk137PLDqnv4&authType=NAME_SEARCH&authToken=V_iG&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A10009941%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907639677%2Ctas%3Amarquin",
-    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAZLAAAAJDQ5Nzg4MjJmLWUyMjQtNDI5Ny05NmY5LTE5Yjc1Y2Q1YWFhOA.jpg"
-  },
   {
     "camper": "Devarsh Ruparelia",
     "quote": "Even though I am still just a high school student. The startup I intern for said that if I finish the full track of Free Code Camp, they will strongly consider me for their programming jobs. Thanks Free Code Camp!",
@@ -356,6 +335,13 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAApxpP8BZBcHQzr6Ci3xmkkZX-OSH_oLuJs&authType=NAME_SEARCH&authToken=wdjb&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A175219967%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441907682493%2Ctas%3Adevarsh",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/7/005/087/339/14535ee.jpg"
   },
+  {
+    "camper": "Miranda Bashore",
+    "quote": "I want to be able to freelance and create dynamic websites. Free Code Camp makes that more of a reality for me, as I cannot afford an expensive bootcamp while getting my Master’s degree.",
+    "github": "DutchBay",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAA8KmJMBTtvvgJzjeAUo_YOssh2yLZZlvlk&authType=NAME_SEARCH&authToken=fWay&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A252352659%2CauthType%3ANAME_SEARCH%2Cidx%3A1-2-2%2CtarId%3A1441907584953%2Ctas%3Amiranda",
+    "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/p/5/005/078/187/0ca3604.jpg"
+  },
   {
     "camper": "Christian Morera",
     "quote": "Free Code Camp has been a great experience. I’ve learned so many things. I am in the process of transitioning from content developer to full stack developer.",
@@ -531,6 +517,13 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAApQxGQBYz-WAQu_0zXPTkW-R7QbdaXEZeA&authType=NAME_SEARCH&authToken=r84S&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A173065316%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908038920%2Ctas%3Amihai%20p",
     "image": "https://lh6.googleusercontent.com/-4JB6FPzm9ZE/VakUEj7WYsI/AAAAAAAALkU/4C0ILUwn-B8/w888-h891-no/profilepic.png"
   },
+  {
+    "camper": "Normandy Real",
+    "quote": "I'm doing Free Code Camp to transition from mainframe programming to front end development.",
+    "github": "mandyreal",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAdebIIBHfcSRnxGI-j6g5y6crfOXSg55Dc&authType=NAME_SEARCH&authToken=xLNy&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A123628674%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444636619442%2Ctas%3ANormandy%20Real",
+    "image": "https://media.licdn.com/media/AAEAAQAAAAAAAAMrAAAAJDAxMmE0ZWI1LWU0MjctNDRjYS1hNjdkLTYwZTI5NjUxMDhjYw.jpg"
+  },
   {
     "camper": "Zlatko Cabric",
     "quote": "I am still in school, pursuing an AS in web development. The JavaScript course in college was a breeze thanks to Free Code Camp.",
@@ -538,6 +531,20 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAsCCFMBUlE24Ie41G_YS3XhdtQMDl5vCZA&authType=NAME_SEARCH&authToken=h1m7&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A184682579%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908055072%2Ctas%3Azlat",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAALQAAAAJDMzNjY4M2UwLWVlYWEtNGQwYS04MDY0LTVjNGVhNGNhYWM5OQ.jpg"
   },
+  {
+    "camper": "Travis Wouters",
+    "quote": "Free Code Camp helped me add skillsets to my resume that show experience instead of knowledge without practical application.",
+    "github": "",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAABHP0YBddxsmaf2OghV2jAy17RVMhig4RM&authType=NAME_SEARCH&authToken=a7pC&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A4669254%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444634846844%2Ctas%3ATravis%20Wouters",
+    "image": "https://media.licdn.com/media/p/8/005/07d/2f1/1792a44.jpg"
+  },
+  {
+    "camper": "Geoff Storbeck",
+    "quote": "I've been able to build tools that has helped moved my current career further and has opened up many more doors in the field.",
+    "github": "storbeck",
+    "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAdVQZYBHPYLt5efKwqZmiDM5SqIdH0_AR4&authType=NAME_SEARCH&authToken=EDd-&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A123027862%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1444635255807%2Ctas%3AGeoff%20Storbeck%09",
+    "image": "https://media.licdn.com/media/p/1/000/124/306/339eee6.jpg"
+  },
   {
     "camper": "Anthony DePaolo",
     "quote": "I can learn web development at my own pace, which is great with my crazy life’s schedule. It also doesn’t cost $10k-$17k, which I just can’t fork over right now.",
@@ -545,4 +552,4 @@
     "linkedin": "https://www.linkedin.com/profile/view?id=AAkAAAOCUkABzCvw3p1mBiPbbFWq91BEFXGXKxA&authType=NAME_SEARCH&authToken=7zb7&locale=en_US&trk=tyah&trkInfo=clickedVertical%3Amynetwork%2CclickedEntityId%3A58872384%2CauthType%3ANAME_SEARCH%2Cidx%3A1-1-1%2CtarId%3A1441908068309%2Ctas%3Aanthony%20depa",
     "image": "https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAAJPAAAAJGI4NGY3ZGI1LWM2N2UtNGQ2Ni1iZDUwLTFkN2I4YWM2YThjMQ.jpg"
   }
-]
\ No newline at end of file
+]
diff --git a/server/views/home.jade b/server/views/home.jade
index b7f796ae4f..404bb8b10f 100644
--- a/server/views/home.jade
+++ b/server/views/home.jade
@@ -33,21 +33,21 @@ block content
             h2 Campers you'll hang out with:
             .row
                 .col-xs-12.col-sm-12.col-md-4
-                    img.img-responsive.testimonial-image.img-center(src="https://s3.amazonaws.com/freecodecamp/testimonial-jen.jpg", alt="@jenthebest's testimonial image")
-                    .testimonial-copy Getting back on track with Free Code Camp and committing to a new career in 2015!
-                    h3 - @jenbestyoga
+                    img.img-responsive.testimonial-image.img-center(src="http://i.imgur.com/xzDoJef.jpg", alt="'s testimonial image")
+                    p.testimonial-copy Free Code Camp helped me get my first engineering job. This amazing community made my career switch a lot easier and more fun.
+                    h3 - Ashley Drake
                 .col-xs-12.col-sm-12.col-md-4
-                    img.img-responsive.testimonial-image.img-center(src="https://s3.amazonaws.com/freecodecamp/testimonial-tate.jpg", alt="@TateThurston's testimonial image")
-                    .testimonial-copy Just built my company's website with skills I've learned from Free Code Camp!
-                    h3 - @TateThurston
+                    img.img-responsive.testimonial-image.img-center(src="http://i.imgur.com/wjlDigg.jpg", alt="Maxim Orlov's LinkedIn photo")
+                    p.testimonial-copy I started Free Code Camp with zero knowledge of web development. 6 months later, I landed my first job as a back end engineer.
+                    h3 - Maxim Orlov
                 .col-xs-12.col-sm-12.col-md-4
-                    img.img-responsive.testimonial-image.img-center(src="https://s3.amazonaws.com/freecodecamp/testimonial-cynthia.jpg", alt="@cynthialanel's testimonial image")
-                    .testimonial-copy  I'm currently working through Free Code Camp to improve my JavaScript. The community is very welcoming!
-                    h3 - @cynthialanel
-            .button-spacer
+                    img.img-responsive.testimonial-image.img-center(src="http://i.imgur.com/dE2Di78.jpg", alt="'s testimonial image")
+                    p.testimonial-copy Free Code Camp gives me more confidence at work. Code doesn’t look as foreign anymore.
+                    h3 - Qing Huang
+            .spacer
             .row
                 .col-xs-12.col-sm-8.col-sm-offset-2
-                    a.btn.btn-big.btn-primary.btn-block(href='/stories') Hear from more of our campers
+                    a.btn.btn-lg.btn-primary.btn-primary-ghost.btn-block(href='/stories') Hear from more of our campers
             .big-break
             h2 Skills you'll learn:
             .text-center.negative-35
diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade
index ec77f5431e..576287baa3 100644
--- a/server/views/resources/stories.jade
+++ b/server/views/resources/stories.jade
@@ -18,5 +18,6 @@ block content
 
 
             if !user
-                a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free)
+                .text-center
+                    a.btn.btn-cta.signup-btn(href="/login") Start learning to code (it's free)
             .spacer

From 745f059eebb7d31ef6444744ba2ccfdb6e18c116 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 14 Oct 2015 23:48:48 -0700
Subject: [PATCH 099/140] hotfix prevent server from starting twice

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

diff --git a/server/server.js b/server/server.js
index 2e6073da0f..088fa3e9a1 100755
--- a/server/server.js
+++ b/server/server.js
@@ -2,7 +2,8 @@ require('dotenv').load();
 var pmx = require('pmx');
 pmx.init();
 
-var uuid = require('node-uuid'),
+var _ = require('lodash'),
+    uuid = require('node-uuid'),
     assign = require('lodash').assign,
     loopback = require('loopback'),
     boot = require('loopback-boot'),
@@ -93,7 +94,7 @@ Object.keys(passportProviders).map(function(strategy) {
   );
 });
 
-app.start = function() {
+app.start = _.once(function() {
   app.listen(app.get('port'), function() {
     app.emit('started');
     console.log(
@@ -105,7 +106,7 @@ app.start = function() {
       console.log('Free Code Camp is in beta mode');
     }
   });
-};
+});
 
 module.exports = app;
 

From 1e439aa4c52078792279a1d283861933d8267772 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 15 Oct 2015 00:33:45 -0700
Subject: [PATCH 100/140] hotfix brownie points

---
 common/models/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/models/user.js b/common/models/user.js
index 06761e0209..bb746ed8d8 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -322,7 +322,7 @@ module.exports = function(User) {
         })
         // no results means this is the first brownie point given by giver
         // so return -1 to indicate receiver should receive point
-        .firstOrDefault(null, -1)
+        .first({ defaultValue: -1 })
         .flatMap((browniePointsFromGiver) => {
           if (browniePointsFromGiver === -1) {
 

From 6aa5c5518a5c8510b869f7eaa696f3632e7e4b01 Mon Sep 17 00:00:00 2001
From: Aniruddh Agarwal <aaniruddh99@gmail.com>
Date: Thu, 15 Oct 2015 16:27:55 +0800
Subject: [PATCH 101/140] Fix typo in pop waypoint test

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

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 7d88e724ce..e215cddda0 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -530,7 +530,7 @@
       ],
       "tests": [
         "assert((function(d){if(d[0] == 'John' && d[1] == 23 && d[2] == undefined){return true;}else{return false;}})(myArray), 'message: <code>myArray</code> should only contain <code>[\"John\", 23]</code>.');",
-        "assert((function(d){if(d[0] == 'cat' && d[1] == 2 && d[2] == undefined){return true;}else{return false;}})(removed), 'message: <code>removed</code> should only contain <code>[\"cat\"], 2</code>.');"
+        "assert((function(d){if(d[0] == 'cat' && d[1] == 2 && d[2] == undefined){return true;}else{return false;}})(removed), 'message: <code>removed</code> should only contain <code>[\"cat\", 2]</code>.');"
       ],
       "challengeSeed": [
         "// var numbers = [1,2,3];",

From 676b5e846769707fe937a5b01a061cf57bf97627 Mon Sep 17 00:00:00 2001
From: Aniruddh Agarwal <aaniruddh99@gmail.com>
Date: Thu, 15 Oct 2015 16:58:19 +0800
Subject: [PATCH 102/140] Add test to truncate string

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

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index c7ec06d6a2..d3a0f22893 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -369,6 +369,7 @@
       "description": [
         "Truncate a string (first argument) if it is longer than the given maximum string length (second argument). Return the truncated string with a \"...\" ending.",
         "Note that the three dots at the end add to the string length.",
+        "If the length of the string is less than or equal to 3 characters, then the length of the three dots is not added to the string length.",
         "Remember to use <a href=\"//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck\" target=\"_blank\">Read-Search-Ask</a> if you get stuck. Write your own code."
       ],
       "challengeSeed": [
@@ -383,7 +384,8 @@
         "assert(truncate(\"A-tisket a-tasket A green and yellow basket\", 11) === \"A-tisket...\", 'message: <code>truncate(\"A-tisket a-tasket A green and yellow basket\", 11)</code> should return \"A-tisket...\".');",
         "assert(truncate(\"Peter Piper picked a peck of pickled peppers\", 14) === \"Peter Piper...\", 'message: <code>truncate(\"Peter Piper picked a peck of pickled peppers\", 14)</code> should return \"Peter Piper...\".');",
         "assert(truncate(\"A-tisket a-tasket A green and yellow basket\", \"A-tisket a-tasket A green and yellow basket\".length) === \"A-tisket a-tasket A green and yellow basket\", 'message: <code>truncate(\"A-tisket a-tasket A green and yellow basket\", \"A-tisket a-tasket A green and yellow basket\".length)</code> should return \"A-tisket a-tasket A green and yellow basket\".');",
-        "assert(truncate('A-tisket a-tasket A green and yellow basket', 'A-tisket a-tasket A green and yellow basket'.length + 2) === 'A-tisket a-tasket A green and yellow basket', 'message: <code>truncate(\"A-tisket a-tasket A green and yellow basket\", \"A-tisket a-tasket A green and yellow basket\".length + 2)</code> should return \"A-tisket a-tasket A green and yellow basket\".');"
+        "assert(truncate('A-tisket a-tasket A green and yellow basket', 'A-tisket a-tasket A green and yellow basket'.length + 2) === 'A-tisket a-tasket A green and yellow basket', 'message: <code>truncate(\"A-tisket a-tasket A green and yellow basket\", \"A-tisket a-tasket A green and yellow basket\".length + 2)</code> should return \"A-tisket a-tasket A green and yellow basket\".');",
+        "assert(truncate(\"A-\", 1) === \"A...\", 'message: <code>truncate(\"A-\", 1)</code> should return \"A...\".');"
       ],
       "MDNlinks": [
         "String.slice()"

From e82e6e9d41321c76f2f1595d755288aef203e047 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Thu, 15 Oct 2015 06:34:46 -0700
Subject: [PATCH 103/140] Fix Waypoint Change Font Size Tests

Removes a test that is not consistent with the instructions.
Closes #3749
---
 seed/challenges/html5-and-css.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 5f2cdf9548..c54d12541a 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -542,7 +542,6 @@
         "assert($(\"p\").length > 1, 'You need 2 <code>p</code> elements with Kitty Ipsum text.')",
         "assert(editor.match(/<\\/p>/g) && editor.match(/<\\/p>/g).length === editor.match(/<p/g).length, 'Make sure each of your <code>p</code> elements has a closing tag.')",
         "assert.isTrue((/Purr\\s+jump\\s+eat/gi).test($(\"p\").text()), 'Your <code>p</code> element should contain the first few words of the provided additional <code>kitty ipsum text</code>.')",
-        "assert($(\"p.red-text\").length === 2, 'Give each of your <code>p</code> elements the <code>red-text</code> class.')",
         "assert($(\"p\").css(\"font-size\") === \"16px\", 'Give elements with the <code>red-text</code> class a <code>font-size</code> of 16px.')"
       ],
       "challengeSeed": [

From e789e74c89a2cd0065d2d35e66ca1c58f404f6eb Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Thu, 15 Oct 2015 17:12:54 -0700
Subject: [PATCH 104/140] Cleanup OOP and Functional Programming Waypoints

Fixes some typos, adds instructions, and tries to make some of the wording clearer and more consistent.
Closes #3760
---
 ...t-oriented-and-functional-programming.json | 53 +++++++++++--------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index 8f1c7a8a1a..c663444d4e 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -100,7 +100,7 @@
       ],
       "tests":[
         "assert(typeof(myBike.getSpeed)!=='undefined' && typeof(myBike.getSpeed) === 'function', 'message: The method getSpeed of myBike should be accessible outside the object.');",
-        "assert(typeof(myBike.speed) === 'undefined', 'message: <code>myBike.speed</code> should remain undefined.');",
+        "assert(typeof(myBike.speed) === 'undefined', 'message: <code>myBike.speed</code> should be undefined.');",
         "assert(typeof(myBike.addUnit) === 'undefined', 'message: <code>myBike.addUnit</code> should remain undefined.');"
       ],
       "challengeSeed":[
@@ -147,10 +147,11 @@
         "A function that creates objects is called a <code>constructor</code>.",
         "You can create <code>instances</code> of an object using a <code>constructor</code>.",
         "Each new <code>instance</code> of this object <code>inherits</code> all the <code>properties</code> and <code>methods</code> of your original object.",
-        "Then you can give the instance new properties."
+        "Once an <code>instance</code> has been created you can add <code>properties</code> to that <code>instance</code> individually.",
+        "Add an <code>engines</code> property with a number value to the <code>myCar</code> instance."
       ],
       "tests":[
-        "assert((new Car()).wheels === 4, 'message: The property <code>wheels</code> should still be 4 like in the object constructor.');",
+        "assert((new Car()).wheels === 4, 'message: The property <code>wheels</code> should still be 4 in the object constructor.');",
         "assert(typeof((new Car()).engines) === 'undefined', 'message: There should not be a property <code>engines</code> in the object constructor.');",
         "assert(myCar.wheels === 4, 'message: The property <code>wheels</code> of myCar should equal 4.');",
         "assert(typeof(myCar.engines) === 'number', 'message: The property <code>engines</code> of myCar should be a number.');"
@@ -177,12 +178,12 @@
       "title":"Iterate over Arrays with .map",
       "difficulty":0,
       "description":[
+        "The map method is one of the easiest ways to iterate through an array or object there is. Let's use it now.",
         "<code>array = array.map(function(val){</code>",
         "<code>&thinsp;&thinsp;return val+1;</code>",
         "<code>});</code>",
         "",
-        "The map method is one of the easiest ways to iterate through an array or object there is. Let's use it now.",
-        "Use the map function to add 3 to every value in the variable <code>array</code>"
+        "Use the map function to add 3 to every value in the variable <code>array</code>."
       ],
       "tests":[
         "assert.deepEqual(array, [4,5,6,7,8], 'message: You should add three to each value in the array.');",
@@ -210,10 +211,11 @@
         "Reduce can be useful for condensing an array of numbers into one value.",
         "<code>var singleVal = array.reduce(function(previousVal, currentVal){</code>",
         "<code>&thinsp;&thinsp;return previousVal+currentVal;</code>",
-        "<code>});</code>"
+        "<code>});</code>",
+        "Use the <code>reduce</code> function to sum all the values in <code>array</code> and assign it to <code>singleVal</code>."
       ],
       "tests":[
-        "assert(singleVal == 30, 'message: <code>singleVal</code> should have been set to the result of your reduce operation.');",
+        "assert(singleVal == 30, 'message: <code>singleVal</code> should be equal to the sum of all items in the <code>array</code> variable.');",
         "assert(editor.getValue().match(/\\.reduce\\s*\\(/gi), 'message: You should have made use of the reduce method.');"
       ],
       "challengeSeed":[
@@ -234,7 +236,7 @@
       "title":"Filter Arrays with .filter",
       "difficulty":0,
       "description":[
-        "filter is a useful method that can filter out values that don't match a certain criteria",
+        "Filter is a useful method that can filter out values that don't match a certain criteria",
         "Let's remove all the values greater than five",
         "<code>array = array.filter(function(val) {</code>",
         "<code>&thinsp;&thinsp;return val <= 5;</code>",
@@ -262,14 +264,15 @@
       "title": "Sort Arrays with .sort",
       "difficulty":0,
       "description":[
-        "You can use the method sort to easily sort the values in the array alphabetically or numerically",
-        "<code>var array = [1,3,2];</code>",
+        "You can use the method <code>sort</code> to easily sort the values in the array alphabetically or numerically.",
+        "<code>var array = [1, 3, 2];</code>",
         "<code>array = array.sort();</code>",
-        "This will return <code>[1, 2, 3]</code>"
+        "<code>array</code> is now <code>[1, 2, 3]</code>.",
+        "Use <code>sort</code> to sort <code>array</code> alphabetically."
       ],
       "tests":[
         "assert.deepEqual(array, ['alpha', 'beta', 'charlie'], 'message: You should have sorted the array alphabetically.');",
-        "assert(editor.getValue().match(/\\[\\'beta\\'\\,\\s\\'alpha\\'\\,\\s'charlie\\'\\];/gi), 'message: You should be sorting the array using sort.');",
+        "assert(editor.getValue().match(/\\[\\'beta\\'\\,\\s\\'alpha\\'\\,\\s'charlie\\'\\];/gi), 'message: You should only be using <code>.sort</code> to modify the array.');",
         "assert(editor.getValue().match(/\\.sort\\s*\\(\\)/gi), 'message: You should have made use of the sort method.');"
       ],
       "challengeSeed":[
@@ -288,12 +291,13 @@
       "id": "cf1111c1c16feddfaeb2bdef",
       "title": "Reverse Arrays with .reverse",
       "description": [
-        "You can use the <code>.reverse()</code> function to reverse the contents of an array."
+        "You can use the <code>reverse</code> function to reverse the contents of an array.",
+        "Add a line of code that uses <code>reverse</code> to reverse the <code>array</code> variable."
       ],
       "tests": [
         "assert.deepEqual(array, [7,6,5,4,3,2,1], 'message: You should reverse the array.');",
-        "assert(editor.getValue().match(/\\.reverse\\s*\\(\\)/gi), 'message: You should use the reverse method.');",
-        "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7/gi), 'message: You should return <code>[7,6,5,4,3,2,1]</code>.');"
+        "assert(editor.getValue().match(/\\.reverse\\s*\\(\\)/gi), 'message: You should use the <code>reverse</code> method.');",
+        "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7/gi), 'message: You should only be using <code>revserse</code> to modify <code>array</code>.');"
       ],
       "challengeSeed": [
         "var array = [1,2,3,4,5,6,7];",
@@ -312,12 +316,13 @@
       "title": "Concatenate Strings with .concat",
       "description": [
         "<code>.concat()</code> can be used to merge the contents of two arrays into one.",
-        "<code>array = array.concat(otherArray);</code>"
+        "<code>array = array.concat(otherArray);</code>",
+        "Use <code>.concat()</code> to concatenate <code>concatMe</code> onto the end of <code>array</code> and assign it back to array."
       ],
       "tests": [
-        "assert.deepEqual(array, [1,2,3,4,5,6], 'You should concat the two arrays together.');",
-        "assert(editor.getValue().match(/\\.concat\\s*\\(/gi), 'message: You should be use the concat method to merge the two arrays.');",
-        "assert(editor.getValue().match(/\\[1\\,2\\,3\\]/gi) && editor.getValue().match(/\\[4\\,5\\,6\\]/gi), 'message: You should only modify the two arrays without changing the origional ones.');"
+        "assert.deepEqual(array, [1,2,3,4,5,6], 'message: You should concat the two arrays together.');",
+        "assert(editor.getValue().match(/\\.concat\\s*\\(/gi), 'message: You should be using the <code>concat</code> method to merge the two arrays.');",
+        "assert(editor.getValue().match(/\\[1\\,2\\,3\\]/gi) && editor.getValue().match(/\\[4\\,5\\,6\\]/gi), 'message: You should only be using <code>concat</code> to modify the arrays.');"
       ],
       "challengeSeed": [
         "var array = [1,2,3];",
@@ -339,8 +344,9 @@
       "difficulty":0,
       "description":[
         "You can use the <code>.split()</code> method to split a string into an array.",
-        "split uses the argument you give to to split the string.",
-        "<code>array = string.split(' ');</code>"
+        "<code>.split()</code> uses the argument you pass in as a delimiter to determine which points the string should be split at.",
+        "<code>var array = string.split(' ');</code>",
+        "Use <code>.split()</code> to create an array of words from <code>string</code> and assign it to <code>array</code>."
       ],
       "tests":[
         "assert(typeof(array) === 'object' && array.length === 5, 'message: You should split the string by its spaces.');",
@@ -364,10 +370,11 @@
       "difficulty":0,
       "description":[
         "We can use the <code>.join()</code> method to join each element in an array into a string separated by whatever delimiter you provide as an argument to the join operation.",
-        "<code>var joinMe = joinMe.join(\" \");</code>"
+        "<code>var joinMe = joinMe.join(\" \");</code>",
+        "Use the <code>.join()</code> method to create a string from <code>joinMe</code> with spaces in between each element and assign it back to <code>joinMe</code>."
       ],
       "tests":[
-        "assert(typeof(joinMe) === 'string' && joinMe === \"Split me into an array\", 'message: You should join the arrays by their spaces.');",
+        "assert(typeof(joinMe) === 'string' && joinMe === \"Split me into an array\", 'message: You should join the elements of the array with spaces.');",
         "assert(/\\.join\\(/gi, 'message: You should use of the join method on the array.');"
       ],
       "challengeSeed":[

From 009635dd31147779c559aae9ef5eb45db9e78009 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Thu, 15 Oct 2015 20:17:29 -0700
Subject: [PATCH 105/140] Add MDN Links to Functional Programming Waypoints

---
 ...t-oriented-and-functional-programming.json | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index c663444d4e..d80a50de85 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -200,6 +200,9 @@
         "// Only change code above this line.",
         "(function() {return array;})();"
       ],
+      "MDNlinks":[
+        "Array.map()"
+      ],
       "challengeType":1,
       "type": "waypoint"
     },
@@ -228,6 +231,9 @@
         "// Only change code above this line.",
         "(function() {return singleVal;})();"
       ],
+      "MDNlinks":[
+        "Array.reduce()"
+      ],
       "challengeType":1,
       "type": "waypoint"
     },
@@ -256,6 +262,9 @@
         "  // Only change code above this line.",
         "(function() {return array;})();"
       ],
+      "MDNlinks":[
+        "Array.filter()"
+      ],
       "challengeType":1,
       "type": "waypoint"
     },
@@ -284,6 +293,9 @@
         "  // Only change code above this line.",
         "(function() {return array;})();"
       ],
+      "MDNlinks":[
+        "Array.sort()"
+      ],
       "challengeType":1,
       "type": "waypoint"
     },
@@ -308,6 +320,9 @@
         "  // Only change code above this line.",
         "(function() {return array;})();"
       ],
+      "MDNlinks":[
+        "Array.reverse()"
+      ],
       "challengeType": 1,
       "type": "waypoint"
     },
@@ -335,6 +350,9 @@
         "// Only change code above this line.",
         "(function() {return array;})();"
       ],
+      "MDNlinks":[
+        "Array.concat()"
+      ],
       "challengeType": 1,
       "type": "waypoint"
     },
@@ -361,6 +379,9 @@
         "// Only change code above this line.",
         "(function() {return array;})();"
       ],
+      "MDNlinks":[
+        "String.split()"
+      ],
       "challengeType":1,
       "type": "waypoint"
     },
@@ -386,6 +407,9 @@
         "// Only change code above this line.",
         "(function() {return joinMe;})();"
       ],
+      "MDNlinks":[
+        "Array.join()"  
+      ],
       "challengeType":1,
       "type": "waypoint"
     }

From c453f8feb17cf8b13872212aaee2bd121e3a2532 Mon Sep 17 00:00:00 2001
From: Abhisek Pattnaik <abhisekp@engineer.com>
Date: Fri, 16 Oct 2015 14:40:47 +0530
Subject: [PATCH 106/140] Remove extra \ (backslash) character

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

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index d3a0f22893..e2e2fa0e3f 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -143,7 +143,7 @@
         "assert(palindrome(\"almostomla\") === false, 'message: <code>palindrome(\"almostomla\")</code> should return false.');",
         "assert(palindrome(\"My age is 0, 0 si ega ym.\") === true, 'message: <code>palindrome(\"My age is 0, 0 si ega ym.\")</code> should return true.');",
         "assert(palindrome(\"1 eye for of 1 eye.\") === false, 'message: <code>palindrome(\"1 eye for of 1 eye.\")</code> should return false.');",
-        "assert(palindrome(\"0_0 (: /-\\ :) 0-0\") === true, 'message: <code>palindrome(\"0_0 (: /-\\\\ :) 0-0\")</code> should return true.');"
+        "assert(palindrome(\"0_0 (: /-\\ :) 0-0\") === true, 'message: <code>palindrome(\"0_0 (: /-\\ :) 0-0\")</code> should return true.');"
       ],
       "challengeSeed": [
         "function palindrome(str) {",

From 08ed150a6d82014af241f939c1c90a4378714f86 Mon Sep 17 00:00:00 2001
From: Ben McMahon <benmcmahon100@gmail.com>
Date: Fri, 16 Oct 2015 13:38:43 +0100
Subject: [PATCH 107/140] Moved document.ready explanation to an earlier
 challenge

---
 seed/challenges/jquery.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index e220c99d29..d4625a85a4 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -11,7 +11,9 @@
         "Before we can start using jQuery, we need to add some things to our HTML.",
         "First, add a <code>script</code> element at the top of your page. Be sure to close it on the following line.",
         "Your browser will run any JavaScript inside a <code>script</code> element, including jQuery.",
-        "Inside your <code>script</code> element, add this code: <code>$(document).ready(function() {</code> to your <code>script</code>. Then close it on the following line (still inside your <code>script</code> element) with: <code>});</code>"
+        "Inside your <code>script</code> element, add this code: <code>$(document).ready(function() {</code> to your <code>script</code>. Then close it on the following line (still inside your <code>script</code> element) with: <code>});</code>",
+        "We'll learn more about <code>functions</code> later. The important thing to know is that code you put inside this <code>function</code> will run as soon as your browser has loaded your page.",
+        "This is important because without your <code>document ready function</code>, your code may run before your HTML is rendered, which would cause bugs."
       ],
       "tests": [
         "assert(editor.match(/<script>/g), 'Create a <code>script</code> element.')",
@@ -53,8 +55,7 @@
       "id": "bad87fee1348bd9bedc08826",
       "title": "Target HTML Elements with Selectors Using jQuery",
       "description": [
-        "Now we have a <code>document ready function</code>. We'll learn more about <code>functions</code> later. The important thing to know is that code you put inside this <code>function</code> will run as soon as your browser has loaded your page.",
-        "This is important because without your <code>document ready function</code>, your code may run before your HTML is rendered, which would cause bugs.",
+        "Now we have a <code>document ready function</code>.",
         "Now let's write our first jQuery statement. All jQuery functions start with a <code>$</code>, usually referred to as a <code>dollar sign operator</code>, or simply as <code>bling</code>.",
         "jQuery often selects an HTML element with a <code>selector</code>, then does something to that element.",
         "For example, let's make all of your <code>button</code> elements bounce. Just add this code inside your document ready function: <code>$(\"button\").addClass(\"animated bounce\")</code>.",

From d91d514a0bc39f510ab0d24c6e31ec7c457bd7b1 Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Fri, 16 Oct 2015 09:09:31 -0700
Subject: [PATCH 108/140] Fix BF Diff two Arrays Remove Final Test

Per the discussion in #3758
Closes #3758
---
 seed/challenges/intermediate-bonfires.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index 248382e6f3..d8b008208d 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -67,8 +67,7 @@
         "assert.deepEqual(diff([1, 2, 3, 5], [1, 2, 3, 4, 5]), [4], 'message: <code>[1, 2, 3, 5], [1, 2, 3, 4, 5]</code> should return <code>[4]</code>.');",
         "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]), [\"piglet\", 4], 'message: <code>[1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]</code> should return <code>[\"piglet\", 4]</code>.');",
         "assert.deepEqual(diff([], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]), [\"snuffleupagus\", \"cookie monster\", \"elmo\"], 'message: <code>[], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code> should return <code>[\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code>.');",
-        "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: <code>[1, \"calf\", 3, \"piglet\"], [7, \"filly\"]</code> should return <code>[1, \"calf\", 3, \"piglet\", 7, \"filly\"]</code>.');",
-        "assert.deepEqual(diff([1, 2, 3, 3], [1]), [2, 3], 'message: <code>[1, 2, 3, 3], [1]</code> should return <code>[2, 3]</code>.');"
+        "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: <code>[1, \"calf\", 3, \"piglet\"], [7, \"filly\"]</code> should return <code>[1, \"calf\", 3, \"piglet\", 7, \"filly\"]</code>.');"
       ],
       "MDNlinks": [
         "Comparison Operators",

From a0182957e75b2e81ab5883ad0c920344fde79cde Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 8 Oct 2015 16:42:24 -0700
Subject: [PATCH 109/140] Add chat to challenges!

---
 client/commonFramework.js                        |  8 ++++++++
 client/less/main.less                            |  5 +++++
 server/middlewares/csp.js                        |  1 +
 server/views/coursewares/showBonfire.jade        | 16 +++++++++++-----
 server/views/coursewares/showHTML.jade           |  8 +++++++-
 server/views/coursewares/showJS.jade             | 15 ++++++++++-----
 server/views/coursewares/showStep.jade           |  2 ++
 server/views/coursewares/showVideo.jade          | 14 +++++++++-----
 .../views/coursewares/showZiplineOrBasejump.jade | 11 ++++++++++-
 server/views/partials/challenge-modals.jade      | 14 --------------
 10 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index a28a1e743d..5c5ebea6a5 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -49,6 +49,14 @@ var common = (function() {
     });
   };
 
+  // this will overwrite if gitter object is already present
+  common.createGitterOptions = function createGitterOptions(room) {
+    ((window.gitter = {}).chat = {}).options = {
+      room: room,
+      activationElement: document.createElement('div')
+    };
+  };
+
   return common;
 })();
 
diff --git a/client/less/main.less b/client/less/main.less
index 4340350da7..d71a96eba2 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -951,6 +951,11 @@ code {
   margin: 0!important;
 }
 
+// gitter chat
+.gitter-chat-embed {
+ z-index: 20000 !important;
+}
+
 //uncomment this to see the dimensions of all elements outlined in red
 //* {
 //  border-color: red;
diff --git a/server/middlewares/csp.js b/server/middlewares/csp.js
index 74914f56b2..0c812e00c6 100644
--- a/server/middlewares/csp.js
+++ b/server/middlewares/csp.js
@@ -55,6 +55,7 @@ export default function csp() {
   return helmet.csp({
     defaultSrc: trusted,
     scriptSrc: [
+      'https://*.gitter.im',
       '*.optimizely.com',
       '*.aspnetcdn.com',
       '*.d3js.org',
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index 1768bd4274..0facf90abf 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -52,7 +52,7 @@ block content
                     label.btn.btn-success#trigger-reset-modal
                         i.fa.fa-refresh
                             | &nbsp; Reset
-                    label.btn.btn-success#trigger-help-modal
+                    label.btn.btn-success.js-gitter-toggle-chat-button
                         i.fa.fa-medkit
                             | &nbsp; Help
                     label.btn.btn-success#trigger-issue-modal
@@ -122,7 +122,13 @@ block content
                     a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
     include ../partials/challenge-modals
     script.
-        var MDNlinks = !{JSON.stringify(MDNlinks)};
-        if (!MDNlinks.length) {
-            $('#MDN-links').addClass('collapse');
-        }
+      // requires common framework
+      if (window.common) {
+        window.common.createGitterOptions('freecodecamp/helpbonfires', 'challenge-help-chat-btn');
+      }
+
+      var MDNlinks = !{JSON.stringify(MDNlinks)};
+      if (!MDNlinks.length) {
+          $('#MDN-links').addClass('collapse');
+      }
+    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index f08d6997dc..f3a4b4ad11 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -38,7 +38,7 @@ block content
                         label.btn.btn-success#trigger-reset-modal
                             i.fa.fa-refresh
                                 | &nbsp; Reset
-                        label.btn.btn-success#trigger-help-modal
+                        label.btn.btn-success.js-gitter-toggle-chat-button
                             i.fa.fa-medkit
                                 | &nbsp; Help
                         label.btn.btn-success#trigger-issue-modal
@@ -95,3 +95,9 @@ block content
                             else
                                 a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
     include ../partials/challenge-modals
+    script.
+      // requires common framework
+      if (window.common) {
+        window.common.createGitterOptions('freecodecamp/help');
+      }
+    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade
index f4621b5b28..e8d693c8aa 100644
--- a/server/views/coursewares/showJS.jade
+++ b/server/views/coursewares/showJS.jade
@@ -43,7 +43,7 @@ block content
                         label.btn.btn-success#trigger-reset-modal
                             i.fa.fa-refresh
                                 | &nbsp; Reset
-                        label.btn.btn-success#trigger-help-modal
+                        label.btn.btn-success.js-gitter-toggle-chat-button
                             i.fa.fa-medkit
                                 | &nbsp; Help
                         label.btn.btn-success#trigger-issue-modal
@@ -98,7 +98,12 @@ block content
                             a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
     include ../partials/challenge-modals
     script.
-        var MDNlinks = !{JSON.stringify(MDNlinks)};
-        if (!MDNlinks.length) {
-            $('#MDN-links').addClass('collapse');
-        }
+      // requires common framework
+      if (window.common) {
+        window.common.createGitterOptions('freecodecamp/help');
+      }
+      var MDNlinks = !{JSON.stringify(MDNlinks)};
+      if (!MDNlinks.length) {
+          $('#MDN-links').addClass('collapse');
+      }
+    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/coursewares/showStep.jade b/server/views/coursewares/showStep.jade
index 274b9e72b3..c524ab6e24 100644
--- a/server/views/coursewares/showStep.jade
+++ b/server/views/coursewares/showStep.jade
@@ -32,6 +32,7 @@ block content
     script(src=rev('/js', 'commonFramework.js'))
     script.
       var common = window.common || { init: [] };
+      common.createGitterOptions('freecodecamp/help');
       common.challengeId = !{JSON.stringify(challengeId)};
       common.challengeName = !{JSON.stringify(name)};
       common.challengeType = 7;
@@ -40,3 +41,4 @@ block content
       common.isFrontEndCert = !{JSON.stringify(isFrontEndCert || false)};
       common.isFullStackCert = !{JSON.stringify(isFullStackCert || false)};
       common.challengeSeed = !{JSON.stringify(challengeSeed || [])};
+    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/coursewares/showVideo.jade b/server/views/coursewares/showVideo.jade
index bd7f42e5ed..5118a8624a 100644
--- a/server/views/coursewares/showVideo.jade
+++ b/server/views/coursewares/showVideo.jade
@@ -24,7 +24,7 @@ block content
                     var userLoggedIn = true;
             .button-spacer
             .btn-group.input-group.btn-group-justified
-                .btn.btn-success.btn-big#trigger-help-modal
+                .btn.btn-success.btn-big.js-gitter-toggle-chat-button
                     i.fa.fa-medkit
                         | &nbsp; Get help
                 .btn.btn-success.btn-big#trigger-issue-modal
@@ -74,8 +74,12 @@ block content
         script.
             $('body').bind('keypress', controlEnterHandler);
     script.
-        var challenge_Id = !{JSON.stringify(challengeId)};
-        var challenge_Name = !{JSON.stringify(name)};
-        var challengeType = !{JSON.stringify(challengeType)};
-        var dashedName = !{JSON.stringify(dashedName)};
+      var challenge_Id = !{JSON.stringify(challengeId)};
+      var challenge_Name = !{JSON.stringify(name)};
+      var challengeType = !{JSON.stringify(challengeType)};
+      var dashedName = !{JSON.stringify(dashedName)};
+      if (window.common) {
+        window.common.createGitterOptions('freecodecamp/help');
+      }
     include ../partials/challenge-modals
+    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade
index 174be42e3e..642599b702 100644
--- a/server/views/coursewares/showZiplineOrBasejump.jade
+++ b/server/views/coursewares/showZiplineOrBasejump.jade
@@ -24,7 +24,7 @@ block content
                 a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
             .button-spacer
             .btn-group.input-group.btn-group-justified
-                .btn.btn-success.btn-big#trigger-help-modal
+                .btn.btn-success.btn-big.js-gitter-toggle-chat-button
                     i.fa.fa-medkit
                         | &nbsp; Help
                 .btn.btn-success.btn-big#trigger-issue-modal
@@ -96,3 +96,12 @@ block content
         script.
             $('body').on('keypress', controlEnterHandler);
     include ../partials/challenge-modals
+    script.
+      if (window.common) {
+        window.common.createGitterOptions(
+          !{JSON.stringify(challengeType)} === 3 ?
+            'freecodecamp/helpZiplines' :
+            'freecodecamp/helpBonfires'
+        );
+      }
+    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade
index 46f6eae7ee..7510fbeef3 100644
--- a/server/views/partials/challenge-modals.jade
+++ b/server/views/partials/challenge-modals.jade
@@ -10,20 +10,6 @@
                 a.btn.btn-lg.btn-primary.btn-block#report-issue(name='_csrf', value=_csrf) Create my GitHub issue
                 a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
 
-#help-modal.modal(tabindex='-1')
-    .modal-dialog.animated.fadeIn.fast-animation
-        .modal-content
-            .modal-header.challenge-list-header Need some help?
-                a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
-            .modal-body.text-center
-                h3 Remember to use &thinsp;
-                    a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck', target='_blank') Read-Search-Ask
-                    | .
-                h3 If you've already read the errors and searched Google, you should ask for help.
-                h3 This will take you to our help room.
-                a.btn.btn-lg.btn-primary.btn-block.close-modal(href='https://gitter.im/FreeCodeCamp/help', target='_blank') Take me to the help room
-                a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
-
 #reset-modal.modal(tabindex='-1')
     .modal-dialog.animated.fadeInUp.fast-animation
         .modal-content

From 35219cdce33e459867a4abfbfacf1105dfd14e38 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 16 Oct 2015 11:57:33 -0700
Subject: [PATCH 110/140] Add main chat window on nav bar chat click

---
 client/commonFramework.js                     |  8 ----
 client/main.js                                | 47 ++++++++++++++++++-
 server/views/coursewares/showBonfire.jade     | 13 ++---
 server/views/coursewares/showHTML.jade        | 12 ++---
 server/views/coursewares/showJS.jade          | 12 ++---
 server/views/coursewares/showStep.jade        |  2 -
 server/views/coursewares/showVideo.jade       | 12 +++--
 .../coursewares/showZiplineOrBasejump.jade    | 20 ++++----
 server/views/partials/footer.jade             |  3 ++
 server/views/partials/navbar.jade             |  2 +-
 10 files changed, 87 insertions(+), 44 deletions(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index 5c5ebea6a5..a28a1e743d 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -49,14 +49,6 @@ var common = (function() {
     });
   };
 
-  // this will overwrite if gitter object is already present
-  common.createGitterOptions = function createGitterOptions(room) {
-    ((window.gitter = {}).chat = {}).options = {
-      room: room,
-      activationElement: document.createElement('div')
-    };
-  };
-
   return common;
 })();
 
diff --git a/client/main.js b/client/main.js
index 892610e1eb..6415c90d2d 100644
--- a/client/main.js
+++ b/client/main.js
@@ -4,6 +4,50 @@ main.mapShareKey = 'map-shares';
 
 main.ga = window.ga || function() {};
 
+main = (function(main) {
+
+  ((window.gitter = {}).chat = {}).options = {
+    disableDefaultChat: true
+  };
+  // wait for sidecar to load
+
+  main.chat = {};
+  main.chat.isOpen = false;
+  main.chat.createHelpChat = function createHelpChat() {
+    throw new Error('Sidecar chat has not initialized');
+  };
+
+  document.addEventListener('gitter-sidecar-ready', function(e) {
+    main.chat.GitterChat = e.detail.Chat;
+
+    main.chat.createHelpChat = function(room, helpChatBtnClass) {
+      main.chat.helpChat = new main.chat.GitterChat({
+        room: room,
+        activationElement: document.createElement('div')
+      });
+
+      $(helpChatBtnClass).on('click', function() {
+        main.chat.helpChat.toggleChat(true);
+      });
+    };
+
+    main.chat.mainChat = new main.chat.GitterChat({
+      room: 'freecodecamp/freecodecamp',
+      activationElement: document.createElement('div')
+    });
+
+      $('#nav-chat-btn').on('click', function() {
+        console.log('Create');
+        if (!main.chat.isOpen) {
+
+          main.chat.mainChat.toggleChat(true);
+        }
+      });
+  });
+
+  return main;
+}(main));
+
 var lastCompleted = typeof lastCompleted !== 'undefined' ?
   lastCompleted :
   '';
@@ -38,9 +82,10 @@ function setMapShare(id) {
 
 $(document).ready(function() {
 
+
   var challengeName = typeof challengeName !== 'undefined' ?
     challengeName :
-    'Untitled';
+    '';
 
   if (challengeName) {
     ga('send', 'event',  'Challenge', 'load', challengeName);
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index 0facf90abf..bc407a5f1d 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -52,7 +52,7 @@ block content
                     label.btn.btn-success#trigger-reset-modal
                         i.fa.fa-refresh
                             | &nbsp; Reset
-                    label.btn.btn-success.js-gitter-toggle-chat-button
+                    label.btn.btn-success#challenge-help-btn
                         i.fa.fa-medkit
                             | &nbsp; Help
                     label.btn.btn-success#trigger-issue-modal
@@ -122,13 +122,14 @@ block content
                     a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
     include ../partials/challenge-modals
     script.
-      // requires common framework
-      if (window.common) {
-        window.common.createGitterOptions('freecodecamp/helpbonfires', 'challenge-help-chat-btn');
-      }
+
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat('freecodecamp/helpbonfires', '#challenge-help-btn');
+        }
+      });
 
       var MDNlinks = !{JSON.stringify(MDNlinks)};
       if (!MDNlinks.length) {
           $('#MDN-links').addClass('collapse');
       }
-    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index f3a4b4ad11..643e79cd06 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -38,7 +38,7 @@ block content
                         label.btn.btn-success#trigger-reset-modal
                             i.fa.fa-refresh
                                 | &nbsp; Reset
-                        label.btn.btn-success.js-gitter-toggle-chat-button
+                        label.btn.btn-success#challenge-help-btn
                             i.fa.fa-medkit
                                 | &nbsp; Help
                         label.btn.btn-success#trigger-issue-modal
@@ -96,8 +96,8 @@ block content
                                 a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
     include ../partials/challenge-modals
     script.
-      // requires common framework
-      if (window.common) {
-        window.common.createGitterOptions('freecodecamp/help');
-      }
-    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
+        }
+      });
diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade
index e8d693c8aa..887e44c964 100644
--- a/server/views/coursewares/showJS.jade
+++ b/server/views/coursewares/showJS.jade
@@ -43,7 +43,7 @@ block content
                         label.btn.btn-success#trigger-reset-modal
                             i.fa.fa-refresh
                                 | &nbsp; Reset
-                        label.btn.btn-success.js-gitter-toggle-chat-button
+                        label.btn.btn-success#challenge-help-btn
                             i.fa.fa-medkit
                                 | &nbsp; Help
                         label.btn.btn-success#trigger-issue-modal
@@ -98,12 +98,12 @@ block content
                             a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
     include ../partials/challenge-modals
     script.
-      // requires common framework
-      if (window.common) {
-        window.common.createGitterOptions('freecodecamp/help');
-      }
       var MDNlinks = !{JSON.stringify(MDNlinks)};
       if (!MDNlinks.length) {
           $('#MDN-links').addClass('collapse');
       }
-    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
+        }
+      });
diff --git a/server/views/coursewares/showStep.jade b/server/views/coursewares/showStep.jade
index c524ab6e24..274b9e72b3 100644
--- a/server/views/coursewares/showStep.jade
+++ b/server/views/coursewares/showStep.jade
@@ -32,7 +32,6 @@ block content
     script(src=rev('/js', 'commonFramework.js'))
     script.
       var common = window.common || { init: [] };
-      common.createGitterOptions('freecodecamp/help');
       common.challengeId = !{JSON.stringify(challengeId)};
       common.challengeName = !{JSON.stringify(name)};
       common.challengeType = 7;
@@ -41,4 +40,3 @@ block content
       common.isFrontEndCert = !{JSON.stringify(isFrontEndCert || false)};
       common.isFullStackCert = !{JSON.stringify(isFullStackCert || false)};
       common.challengeSeed = !{JSON.stringify(challengeSeed || [])};
-    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/coursewares/showVideo.jade b/server/views/coursewares/showVideo.jade
index 5118a8624a..90292e742d 100644
--- a/server/views/coursewares/showVideo.jade
+++ b/server/views/coursewares/showVideo.jade
@@ -24,7 +24,7 @@ block content
                     var userLoggedIn = true;
             .button-spacer
             .btn-group.input-group.btn-group-justified
-                .btn.btn-success.btn-big.js-gitter-toggle-chat-button
+                .btn.btn-success.btn-big#challenge-help-btn
                     i.fa.fa-medkit
                         | &nbsp; Get help
                 .btn.btn-success.btn-big#trigger-issue-modal
@@ -78,8 +78,10 @@ block content
       var challenge_Name = !{JSON.stringify(name)};
       var challengeType = !{JSON.stringify(challengeType)};
       var dashedName = !{JSON.stringify(dashedName)};
-      if (window.common) {
-        window.common.createGitterOptions('freecodecamp/help');
-      }
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
+        }
+      });
     include ../partials/challenge-modals
-    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
+
diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade
index 642599b702..2fff6c4b96 100644
--- a/server/views/coursewares/showZiplineOrBasejump.jade
+++ b/server/views/coursewares/showZiplineOrBasejump.jade
@@ -24,7 +24,7 @@ block content
                 a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
             .button-spacer
             .btn-group.input-group.btn-group-justified
-                .btn.btn-success.btn-big.js-gitter-toggle-chat-button
+                .btn.btn-success.btn-big#challenge-help-btn
                     i.fa.fa-medkit
                         | &nbsp; Help
                 .btn.btn-success.btn-big#trigger-issue-modal
@@ -97,11 +97,13 @@ block content
             $('body').on('keypress', controlEnterHandler);
     include ../partials/challenge-modals
     script.
-      if (window.common) {
-        window.common.createGitterOptions(
-          !{JSON.stringify(challengeType)} === 3 ?
-            'freecodecamp/helpZiplines' :
-            'freecodecamp/helpBonfires'
-        );
-      }
-    script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat(
+            !{JSON.stringify(challengeType)} === 3 ?
+              'freecodecamp/helpZiplines' :
+              'freecodecamp/helpBonfires',
+            '#challenge-help-btn'
+          );
+        }
+      });
diff --git a/server/views/partials/footer.jade b/server/views/partials/footer.jade
index 8bdc9e80b7..025b59a647 100644
--- a/server/views/partials/footer.jade
+++ b/server/views/partials/footer.jade
@@ -22,3 +22,6 @@
             span.sr-only Free Code Camp on Twitter
         a.ion-locked(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy")
             span.sr-only Free Code Camp's Privacy Policy
+
+// scripts should be moved here
+script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 18f3320315..73cc49dabf 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -12,7 +12,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
             li
                 a(href='/map') Map
             li
-                a(href='//gitter.im/FreeCodeCamp/FreeCodeCamp', target='_blank') Chat
+                a#nav-chat-btn(href='#' onclick="return false") Chat
             li
                 a(href='/news', target='_blank') News
             li

From 465a3e399c5969215fe65a52c609e681632b4ae4 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 16 Oct 2015 13:28:53 -0700
Subject: [PATCH 111/140] Add identifiers to chat embed divs

---
 client/less/chat.less | 17 +++++++++++++++++
 client/less/main.less |  2 ++
 client/main.js        | 26 ++++++++++++++++++--------
 gulpfile.js           |  3 ++-
 4 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 client/less/chat.less

diff --git a/client/less/chat.less b/client/less/chat.less
new file mode 100644
index 0000000000..207ab294b1
--- /dev/null
+++ b/client/less/chat.less
@@ -0,0 +1,17 @@
+.gitter-chat-embed {
+  z-index: 100;
+  position: fixed;
+
+  top: 0;
+  left: 60%;
+  bottom: 0;
+  right: 0;
+
+  display: flex;
+  flex-direction: row;
+  transition: transform 0.3s cubic-bezier(0.16, 0.22, 0.22, 1.7);
+}
+
+.gitter-chat-embed.is-collapsed:not(.is-loading) {
+  transform: translateX(110%);
+}
diff --git a/client/less/main.less b/client/less/main.less
index d71a96eba2..540aa96c95 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -1063,3 +1063,5 @@ code {
     transform: rotate(0deg);
   }
 }
+
+@import "chat.less";
diff --git a/client/main.js b/client/main.js
index 6415c90d2d..924585623a 100644
--- a/client/main.js
+++ b/client/main.js
@@ -21,9 +21,15 @@ main = (function(main) {
     main.chat.GitterChat = e.detail.Chat;
 
     main.chat.createHelpChat = function(room, helpChatBtnClass) {
+
+      $('body').append(
+        '<aside id="chat-embed-help" class="gitter-chat-embed is-collapsed" />'
+      );
+
       main.chat.helpChat = new main.chat.GitterChat({
         room: room,
-        activationElement: document.createElement('div')
+        activationElement: false,
+        targetElement: $('#chat-embed-help')
       });
 
       $(helpChatBtnClass).on('click', function() {
@@ -31,18 +37,22 @@ main = (function(main) {
       });
     };
 
+    $('body').append(
+      '<aside id="chat-embed-main" class="gitter-chat-embed is-collapsed" />'
+    );
+
     main.chat.mainChat = new main.chat.GitterChat({
       room: 'freecodecamp/freecodecamp',
-      activationElement: document.createElement('div')
+      activationElement: false,
+      targetElement: $('#chat-embed-main')
     });
 
-      $('#nav-chat-btn').on('click', function() {
-        console.log('Create');
-        if (!main.chat.isOpen) {
+    $('#nav-chat-btn').on('click', function() {
+      if (!main.chat.isOpen) {
 
-          main.chat.mainChat.toggleChat(true);
-        }
-      });
+        main.chat.mainChat.toggleChat(true);
+      }
+    });
   });
 
   return main;
diff --git a/gulpfile.js b/gulpfile.js
index fd5fdda38d..4ae0d93d23 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -79,6 +79,7 @@ var paths = {
   ],
 
   less: './client/less/main.less',
+  lessFiles: './client/less/*.less',
 
   manifest: 'server/manifests/',
 
@@ -392,7 +393,7 @@ var watchDependents = [
 ];
 
 gulp.task('watch', watchDependents, function() {
-  gulp.watch(paths.less, ['less']);
+  gulp.watch(paths.lessFiles, ['less']);
   gulp.watch(paths.js, ['js']);
   gulp.watch(paths.challenges, ['test-challenges']);
   gulp.watch(paths.js, ['js', 'dependents']);

From fc97bc826620a3c90fa88eaff7c67ba6395afd25 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 16 Oct 2015 15:00:26 -0700
Subject: [PATCH 112/140] Add help button toggle

---
 client/main.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/client/main.js b/client/main.js
index 924585623a..2d6a526c77 100644
--- a/client/main.js
+++ b/client/main.js
@@ -33,7 +33,22 @@ main = (function(main) {
       });
 
       $(helpChatBtnClass).on('click', function() {
-        main.chat.helpChat.toggleChat(true);
+        // is button already pressed?
+        // no? open chat
+        // yes? close chat
+        var shouldChatBeOpen = !$(this).hasClass('active');
+        main.chat.helpChat.toggleChat(shouldChatBeOpen);
+        if (shouldChatBeOpen) {
+          $(helpChatBtnClass).addClass('active');
+        }
+      });
+
+      $('#chat-embed-help').on('gitter-chat-toggle', function(e) {
+        var shouldButtonBePressed = !!e.originalEvent.detail.state;
+        if (shouldButtonBePressed) {
+          return $(helpChatBtnClass).addClass('active');
+        }
+        return $(helpChatBtnClass).removeClass('active');
       });
     };
 

From 12eeef2f416696a950e7a435f411ff2ffbd0a297 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 16 Oct 2015 16:10:45 -0700
Subject: [PATCH 113/140] Add chat room titles

---
 client/less/chat.less                         |  7 ++++
 client/main.js                                | 32 ++++++++++++++++++-
 server/views/coursewares/showBonfire.jade     |  2 +-
 .../coursewares/showZiplineOrBasejump.jade    |  7 ++--
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/client/less/chat.less b/client/less/chat.less
index 207ab294b1..a6f83171ca 100644
--- a/client/less/chat.less
+++ b/client/less/chat.less
@@ -1,3 +1,10 @@
+.chat-embed-main-title {
+  display: flex;
+  flex-grow: 1;
+  padding-left: 31px;
+  padding-top: 7px;
+}
+
 .gitter-chat-embed {
   z-index: 100;
   position: fixed;
diff --git a/client/main.js b/client/main.js
index 2d6a526c77..f4e74c5967 100644
--- a/client/main.js
+++ b/client/main.js
@@ -6,6 +6,7 @@ main.ga = window.ga || function() {};
 
 main = (function(main) {
 
+  // should be set before gitter script loads
   ((window.gitter = {}).chat = {}).options = {
     disableDefaultChat: true
   };
@@ -20,7 +21,8 @@ main = (function(main) {
   document.addEventListener('gitter-sidecar-ready', function(e) {
     main.chat.GitterChat = e.detail.Chat;
 
-    main.chat.createHelpChat = function(room, helpChatBtnClass) {
+    main.chat.createHelpChat = function(room, helpChatBtnClass, roomTitle) {
+      roomTitle = roomTitle || 'Waypoint Help';
 
       $('body').append(
         '<aside id="chat-embed-help" class="gitter-chat-embed is-collapsed" />'
@@ -43,8 +45,21 @@ main = (function(main) {
         }
       });
 
+      var helpTitleAdd = false;
       $('#chat-embed-help').on('gitter-chat-toggle', function(e) {
         var shouldButtonBePressed = !!e.originalEvent.detail.state;
+
+        if (!helpTitleAdd) {
+          helpTitleAdd = true;
+          $('#chat-embed-help > .gitter-chat-embed-action-bar').prepend(
+            '<div class="chat-embed-main-title">' +
+              '<span>' +
+                roomTitle +
+              '</span>' +
+            '</div>'
+          );
+        }
+
         if (shouldButtonBePressed) {
           return $(helpChatBtnClass).addClass('active');
         }
@@ -62,6 +77,21 @@ main = (function(main) {
       targetElement: $('#chat-embed-main')
     });
 
+    var mainChatTitleAdded = false;
+    $('#chat-embed-main').on('gitter-chat-toggle', function() {
+      if (mainChatTitleAdded) {
+        return null;
+      }
+      mainChatTitleAdded = true;
+
+      $('#chat-embed-main > .gitter-chat-embed-action-bar').prepend(
+        '<div class="chat-embed-main-title">' +
+          '<span>Free Code Camp\'s Main Chat</span>' +
+        '</div>'
+      );
+    });
+
+
     $('#nav-chat-btn').on('click', function() {
       if (!main.chat.isOpen) {
 
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index bc407a5f1d..84bfdb0e29 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -125,7 +125,7 @@ block content
 
       document.addEventListener('gitter-sidecar-ready', function(e) {
         if (window.main) {
-          window.main.chat.createHelpChat('freecodecamp/helpbonfires', '#challenge-help-btn');
+          window.main.chat.createHelpChat('freecodecamp/helpbonfires', '#challenge-help-btn', 'Bonfires Help');
         }
       });
 
diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade
index 2fff6c4b96..626bde86aa 100644
--- a/server/views/coursewares/showZiplineOrBasejump.jade
+++ b/server/views/coursewares/showZiplineOrBasejump.jade
@@ -102,8 +102,11 @@ block content
           window.main.chat.createHelpChat(
             !{JSON.stringify(challengeType)} === 3 ?
               'freecodecamp/helpZiplines' :
-              'freecodecamp/helpBonfires',
-            '#challenge-help-btn'
+              'freecodecamp/helpBasejumps',
+            '#challenge-help-btn',
+            !{JSON.stringify(challengeType)} === 3 ?
+              'Zipline Help' :
+              'Basejump Help'
           );
         }
       });

From 1b75d041c1a0c37634893c768cbb19a11238eb46 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 16 Oct 2015 16:20:34 -0700
Subject: [PATCH 114/140] Fix logic on basejump/ziplines

---
 server/views/coursewares/showZiplineOrBasejump.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade
index 626bde86aa..5a41beb4d0 100644
--- a/server/views/coursewares/showZiplineOrBasejump.jade
+++ b/server/views/coursewares/showZiplineOrBasejump.jade
@@ -100,11 +100,11 @@ block content
       document.addEventListener('gitter-sidecar-ready', function(e) {
         if (window.main) {
           window.main.chat.createHelpChat(
-            !{JSON.stringify(challengeType)} === 3 ?
+            !{JSON.stringify(challengeType)} !== 3 ?
               'freecodecamp/helpZiplines' :
               'freecodecamp/helpBasejumps',
             '#challenge-help-btn',
-            !{JSON.stringify(challengeType)} === 3 ?
+            !{JSON.stringify(challengeType)} !== 3 ?
               'Zipline Help' :
               'Basejump Help'
           );

From 5b9c534bff58685f5830d750521a9e454287421f Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 16 Oct 2015 16:30:44 -0700
Subject: [PATCH 115/140] Fix logic on zipline/basejumps

---
 .../coursewares/showZiplineOrBasejump.jade    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade
index 5a41beb4d0..f5e4b666d2 100644
--- a/server/views/coursewares/showZiplineOrBasejump.jade
+++ b/server/views/coursewares/showZiplineOrBasejump.jade
@@ -98,15 +98,21 @@ block content
     include ../partials/challenge-modals
     script.
       document.addEventListener('gitter-sidecar-ready', function(e) {
+        var challengeType = !{JSON.stringify(challengeType)};
+        var room = 'freecodecamp/help';
+        var title;
+
+        if (challengeType === '4') {
+          room = 'freecodecamp/helpBasejumps';
+          title = 'Basejump Help';
+        }
+
+        if (challengeType === '3') {
+          room = 'freecodecamp/helpZiplines';
+          title = 'Zipline Help';
+        }
+
         if (window.main) {
-          window.main.chat.createHelpChat(
-            !{JSON.stringify(challengeType)} !== 3 ?
-              'freecodecamp/helpZiplines' :
-              'freecodecamp/helpBasejumps',
-            '#challenge-help-btn',
-            !{JSON.stringify(challengeType)} !== 3 ?
-              'Zipline Help' :
-              'Basejump Help'
-          );
+          window.main.chat.createHelpChat(room, '#challenge-help-btn', title);
         }
       });

From 4589b9ae393dadda5274e9a9c87aed2123320afd Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 16 Oct 2015 16:45:32 -0700
Subject: [PATCH 116/140] add conditional buttons for mobile gitter

---
 server/views/coursewares/showHTML.jade | 6 +++++-
 server/views/partials/navbar.jade      | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index 643e79cd06..e83aa938a8 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -38,7 +38,11 @@ block content
                         label.btn.btn-success#trigger-reset-modal
                             i.fa.fa-refresh
                                 | &nbsp; Reset
-                        label.btn.btn-success#challenge-help-btn
+                        label.btn.btn-success.hidden-sm.hidden-md.hidden-lg
+                            a(href='//gitter.im/freecodecamp/help')
+                                i.fa.fa-medkit
+                                    | &nbsp; Help
+                        label.btn.btn-success.hidden-xs#challenge-help-btn
                             i.fa.fa-medkit
                                 | &nbsp; Help
                         label.btn.btn-success#trigger-issue-modal
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 73cc49dabf..a53dd35892 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -11,8 +11,10 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
                 a.learn-btn(href='#') Learn
             li
                 a(href='/map') Map
-            li
+            li.hidden-xs
                 a#nav-chat-btn(href='#' onclick="return false") Chat
+            li.visible-xs
+                a(href="//gitter.im/freecodecamp/freecodecamp" target="_blank") Chat
             li
                 a(href='/news', target='_blank') News
             li

From af654aebdc6f2c9375470ed8cc7971766123ba7f Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 16 Oct 2015 20:23:24 -0700
Subject: [PATCH 117/140] Hot fix for chat close button

---
 server/middlewares/csp.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/middlewares/csp.js b/server/middlewares/csp.js
index 0c812e00c6..24e1e848cf 100644
--- a/server/middlewares/csp.js
+++ b/server/middlewares/csp.js
@@ -73,7 +73,8 @@ export default function csp() {
     imgSrc: [
       // allow all input since we have user submitted images for
       // public profile
-      '*'
+      '*',
+      'data:'
     ].concat(trusted),
     fontSrc: [
       '*.googleapis.com',

From b1a5f517a258fa86074d28767c0b89d00f86c601 Mon Sep 17 00:00:00 2001
From: noinkling <noinkling@users.noreply.github.com>
Date: Sat, 17 Oct 2015 18:15:55 +1300
Subject: [PATCH 118/140] Move time text out of icon element on map page

---
 server/views/challengeMap/show.jade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index 14243dee9b..9712a09579 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -87,7 +87,8 @@ block content
                     .row
                         .hidden-xs.col-sm-3.col-md-2
                             h3.text-primary.text-right.nowrap
-                                i.fa.fa-clock-o &thinsp;#{challengeBlock.time}
+                                i.fa.fa-clock-o
+                                = challengeBlock.time
                         .col-xs-12.col-sm-9.col-md-10
                             h3 #{challengeBlock.name} &thinsp;
 

From dea4bf39734ccc3ffcaaf9846ea2f92b66ed0493 Mon Sep 17 00:00:00 2001
From: Ankit Aggarwal <ankitaggarwal011@gmail.com>
Date: Sun, 18 Oct 2015 02:18:26 +0530
Subject: [PATCH 119/140] Fix for create-my-github-issue button not working

---
 client/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/main.js b/client/main.js
index f4e74c5967..6f147abcf7 100644
--- a/client/main.js
+++ b/client/main.js
@@ -235,7 +235,7 @@ $(document).ready(function() {
             'links to screenshots if possible.\n\n'
           ].join('');
 
-          if (editor.getValue().trim()) {
+          if (typeof editor !== 'undefined' && editor.getValue().trim()) {
             var type;
             switch (challengeType) {
               case challengeTypes.HTML_CSS_JQ:

From 07942878e7f14994cf5d402ca249db053aeb4723 Mon Sep 17 00:00:00 2001
From: Jonathan Lee Slew <jlslew@users.noreply.github.com>
Date: Sat, 17 Oct 2015 16:58:17 -0400
Subject: [PATCH 120/140] Added missing spaces and fixes a capitalization typo
 in the description of the "Use Bracket Notation to Find the Nth Character in
 a String" waypoint.

See issue #3783
---
 seed/challenges/basic-javascript.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index e215cddda0..42071954e5 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -178,9 +178,9 @@
       "id": "bd7123c9c450eddfaeb5bdef",
       "title": "Use Bracket Notation to Find the Nth Character in a String",
       "description": [
-        "You can also use <code>bracket Notation</code>to get the character at other positions within a string.",
+        "You can also use <code>bracket notation</code> to get the character at other positions within a string.",
         "Remember that computers start counting at 0, so the first character is actually the zeroth character.",
-        "Let's try to set <code>thirdLetterOfLastName</code>to equal the <code>third letter</code> of the <code>lastName</code> variable.",
+        "Let's try to set <code>thirdLetterOfLastName</code> to equal the <code>third letter</code> of the <code>lastName</code> variable.",
         "Try looking at the <code>secondLetterOfFirstName</code> variable declaration if you get stuck."
       ],
       "tests": [

From 6e41fc1d389d5da60053110d2f1da3f9ea0151a9 Mon Sep 17 00:00:00 2001
From: Santhosh Kumar Srinivasan <san@sanspace.in>
Date: Sun, 18 Oct 2015 13:44:17 +0530
Subject: [PATCH 121/140] Fix accepting incorrect answer

Make min nonzero value
Alter the last test to accept only correct answers
---
 seed/challenges/basic-javascript.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index e215cddda0..a513d72ade 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -934,10 +934,10 @@
         "assert(myFunction() >= min, 'message: The random number generated by <code>myFunction</code> should be greater than or equal to the minimum number.');",
         "assert(myFunction() <= max, 'message: The random number generated by <code>myFunction</code> should be less than or equal to the maximum number.');",
         "assert(myFunction() % 1 === 0 , 'message: The random number generated by <code>myFunction</code> should be an integer, not a decimal.');",
-        "assert((function(){if(editor.getValue().match(/max/g).length >= 2 && editor.getValue().match(/min/g).length >= 2 && editor.getValue().match(/Math.floor/g) && editor.getValue().match(/Math.random/g)){return true;}else{return false;}})(), 'message: You should be using the function given in the description to calculate the random in number in a range.');"
+        "assert((function(){if(editor.getValue().match(/max/g).length >= 3 && editor.getValue().match(/min/g).length >= 4 && editor.getValue().match(/Math.floor/g) && editor.getValue().match(/Math.random/g)){return true;}else{return false;}})(), 'message: You should be using the function given in the description to calculate the random in number in a range.');"
       ],
       "challengeSeed":[
-        "var min = 0;",
+        "var min = 1;",
         "var max = 9;",
         "function myFunction() {",
         "  // Make myFunction return a random number between min and max values instead of a decimal",

From cc587d59a5062e712de84e40da5d1861ad08af41 Mon Sep 17 00:00:00 2001
From: emersonp <parker.emerson@gmail.com>
Date: Sun, 18 Oct 2015 09:01:51 -0700
Subject: [PATCH 122/140] Corrected typo - missing period.

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

diff --git a/seed/challenges/nodejs-and-expressjs.json b/seed/challenges/nodejs-and-expressjs.json
index 36b2231409..f046a45006 100644
--- a/seed/challenges/nodejs-and-expressjs.json
+++ b/seed/challenges/nodejs-and-expressjs.json
@@ -98,7 +98,7 @@
       "description": [
         "Let's continue the LearnYouNode Node School challenge. For this Waypoint, we'll do challenges 8 through 10.",
         "Make sure that you are always in your project's \"workspace\" directory. You can always navigate back to this directory by running this command: <code>cd ~/workspace</code>.",
-        "Return to the c9.io workspace you created Now start this tutorial by running <code>learnyounode</code>",
+        "Return to the c9.io workspace you created. Now start this tutorial by running <code>learnyounode</code>",
         "You can view this Node School module's source code on GitHub at <a href='https://github.com/workshopper/learnyounode'>https://github.com/workshopper/learnyounode</a>.",
         "Complete \"HTTP Collect\"",
         "Complete \"Juggling Async\"",

From c9621aac2b4964def4b41e806d9888d485fff3d4 Mon Sep 17 00:00:00 2001
From: hugoender <hugoender42@gmail.com>
Date: Sun, 18 Oct 2015 21:48:21 -0400
Subject: [PATCH 123/140] Change .fa class style text-decoration property to
 none

---
 client/less/main.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/less/main.less b/client/less/main.less
index 540aa96c95..aa70867894 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -96,6 +96,10 @@ h1, h2, h3, h4, h5, h6, p, li {
   margin-right: 5px;
 }
 
+.fa:hover {
+  text-decoration: none;
+}
+
 .img-center {
   margin: 0 auto;
 }

From 3d63b8b020a085b95757cf1a022a2e4b31cb6127 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 18 Oct 2015 19:03:01 -0700
Subject: [PATCH 124/140] update tshirt banner

---
 server/views/challengeMap/show.jade | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index 14243dee9b..1e3f94ba38 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -20,14 +20,17 @@ block content
                 .spacer
                 if (user && user.progressTimestamps.length > 5)
                     #tshirt-notice.col-xs-12.col-md-8.col-md-offset-2.hidden
-                        h2.text-center Get our first-edition t-shirt
+                        h2.text-center Get our first-edition t-shirt.
+                            br
+                            span.text-success Only available until Oct 29!
                         img.thumbnail.img-center.img-responsive(src="http://i.imgur.com/o07uuOL.png")
                         p.text-justify Our community has voted. Get our winning design emblazoned on a durable, American-made American Apparel shirt (available in women's and men's sizes).&thinsp;
                             a(href="https://teespring.com/free-code-camp-shirt-eu" target="_blank") Also ships from Europe
                             | .
                         a.button.btn.btn-block.signup-btn(href="https://teespring.com/get-free-code-camp-t-shirt" target="_blank") Get yours
                         .button-spacer
-                        #hideTshirtNoticeButton.button.btn.btn-block.btn-info Hide this forever
+                        .text-center
+                            a#hideTshirtNoticeButton(href='#') Hide this forever
                         .spacer
                 .row
                     .col-xs-12.col-sm-8.col-sm-offset-2

From 68dfdaf1ff0e809af2e4bd77b92e170bf587f1ee Mon Sep 17 00:00:00 2001
From: Logan Tegman <ltegman@gmail.com>
Date: Mon, 19 Oct 2015 21:27:26 -0700
Subject: [PATCH 125/140] Fix Waypoint Nest Anchor in Paragraph Code Guidance

Added comments to delineate which areas of the code should be modified since we were seeing a lot of confusion on the tests not passing when the `p` tag was at the bottom of the page.
Closes #3805
---
 seed/challenges/html5-and-css.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index c54d12541a..2f59a38a07 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -1156,9 +1156,11 @@
         "</style>",
         "",
         "<h2 class=\"red-text\">CatPhotoApp</h2>",
+        "<!--Do not alter code above this line-->",
         "",
         "<a href=\"http://www.freecatphotoapp.com\">cat photos</a>",
         "",
+        "<!--Do not alter code below this line-->",
         "<img class=\"smaller-image thick-green-border\" src=\"https://bit.ly/fcc-relaxing-cat\">",
         "",
         "<p class=\"red-text\">Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.</p>",

From 7acdfaa09e53712743c40c82d6f59ccf991c55f6 Mon Sep 17 00:00:00 2001
From: junhaoyap <lordyyap@gmail.com>
Date: Sun, 18 Oct 2015 21:13:05 -0700
Subject: [PATCH 126/140] Add regex test for waypoint use CSS to be more strict

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

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index c54d12541a..6b9436ea4d 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -435,6 +435,7 @@
       "tests": [
         "assert($(\"h2\").css(\"color\") === \"rgb(255, 0, 0)\", 'Your <code>h2</code> element should be red.')",
         "assert($(\"h2\").hasClass(\"red-text\"), 'Your <code>h2</code> element should have the class <code>red-text</code>.')",
+        "assert(editor.match(/\\.red-text\\s*\\{\\s*color:\\s*red;\\s*\\}/g), 'Your stylesheet should declare a <code>red-text</code> class and have its color set to red.')",
         "assert($(\"h2\").attr(\"style\") === undefined, 'Do not use inline style declarations like <code>style=\"color&#58; red\"</code> in your <code>h2</code> element.')"
       ],
       "challengeSeed": [

From 7f2f3885f8843d8fee3be3a0254abe2f0d5e3ace Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Mon, 19 Oct 2015 21:55:29 -0700
Subject: [PATCH 127/140] change blog links to lead to medium subdomain

---
 README.md                               |  2 +-
 common/app/components/Footer/links.json |  2 +-
 server/boot/a-extendUser.js             |  4 ++--
 server/views/challengeMap/show.jade     |  2 +-
 server/views/partials/footer.jade       | 26 ++++++++++++-------------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 9b0c87d631..91176090b0 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Our campers (students) start by working through our free, self-paced, browser-ba
 
 80% of our campers are over 25, and nearly a fifth of our campers are women.
 
-This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp), a [blog](http://blog.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp).
+This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp), a [blog](http://medium.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp).
 
 [Join our community here](http://www.freecodecamp.com/signin).
 
diff --git a/common/app/components/Footer/links.json b/common/app/components/Footer/links.json
index 92199b127f..8089a868e4 100644
--- a/common/app/components/Footer/links.json
+++ b/common/app/components/Footer/links.json
@@ -2,7 +2,7 @@
   {
     "className": "ion-speakerphone",
     "content": " Blog  ",
-    "href": "http://blog.freecodecamp.com",
+    "href": "http://medium.freecodecamp.com",
     "target": "_blank"
   },
   {
diff --git a/server/boot/a-extendUser.js b/server/boot/a-extendUser.js
index e93f741250..25cc14bf0a 100644
--- a/server/boot/a-extendUser.js
+++ b/server/boot/a-extendUser.js
@@ -72,9 +72,9 @@ module.exports = function(app) {
         '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\n',
+        'medium.freecodecamp.com.\n\n',
         'Good luck with the challenges!\n\n',
-        '- the Free Code Camp Volunteer Team'
+        '- the Free Code Camp Team'
       ].join('')
     };
 
diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index 9712a09579..2be0974b8c 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -122,7 +122,7 @@ block content
                                 .button-spacer
                                 .row
                                     .col-xs-12.col-sm-8.col-md-6.col-sm-offset-3.col-md-offset-2.hidden
-                                        a.btn.btn-lg.btn-block.signup-btn.map-challenge-block-share Section complete. Share your Portfolio with your friends.
+                                        a.btn.btn-lg.btn-block.signup-btn.map-challenge-block-share Section complete. Share your code portfolio with your friends.
                                             .hidden(id="#{challengeBlock.name}")
     script.
         var username = !{JSON.stringify(user && user.username || '')};
diff --git a/server/views/partials/footer.jade b/server/views/partials/footer.jade
index 025b59a647..6a84724a13 100644
--- a/server/views/partials/footer.jade
+++ b/server/views/partials/footer.jade
@@ -1,25 +1,25 @@
 .fcc-footer
     .col-xs-12.hidden-xs.hidden-sm
-        a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank') &nbsp;Blog&nbsp;&nbsp;
-        a.ion-social-github(href="http://github.com/freecodecamp", target='_blank') &nbsp;GitHub&nbsp;&nbsp;
-        a.ion-social-twitch-outline(href="/twitch") &thinsp;Twitch&nbsp;
-        a.ion-social-linkedin(href="https://www.linkedin.com/edu/school?id=166029", target='_blank') &thinsp;LinkedIn&nbsp;
+        a.ion-speakerphone(href='//medium.freecodecamp.com', target='_blank') &nbsp;Blog&nbsp;&nbsp;
+        a.ion-social-github(href="//github.com/freecodecamp", target='_blank') &nbsp;GitHub&nbsp;&nbsp;
+        a.ion-social-linkedin(href="//www.linkedin.com/edu/school?id=166029", target='_blank') &thinsp;LinkedIn&nbsp;
+        a.ion-social-twitter(href="//twitter.com/freecodecamp", target='_blank') &nbsp;Twitter&nbsp;&nbsp;
         a.ion-social-facebook(href="//facebook.com/freecodecamp") &nbsp;Facebook&nbsp;&nbsp;
-        a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank') &nbsp;Twitter&nbsp;&nbsp;
+        a.ion-social-twitch-outline(href="//twitch.tv/freecodecamp", target='_blank') &thinsp;Twitch&nbsp;
         a.ion-locked(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy") &nbsp;Privacy&nbsp;&nbsp;
     .col-xs-12.visible-xs.visible-sm
-        a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank')
+        a.ion-speakerphone(href='//medium.freecodecamp.com', target='_blank')
             span.sr-only Free Code Camp's Blog
-        a.ion-social-github(href="http://github.com/freecodecamp", target='_blank')
+        a.ion-social-github(href="//github.com/freecodecamp", target='_blank')
             span.sr-only Free Code Camp on GitHub
-        a.ion-social-twitch-outline(href="/twitch")
-            span.sr-only Free Code Camp Live Pair Programming on Twitch.tv
-        a.ion-social-linkedin(href="https://www.linkedin.com/edu/school?id=166029", target='_blank')
+        a.ion-social-linkedin(href="//www.linkedin.com/edu/school?id=166029", target='_blank')
             span.sr-only Free Code Camp LinkedIn Alumni Network
-        a.ion-social-facebook(href="//facebook.com/freecodecamp")
-            span.sr-only Free Code Camp local groups on Facebook
-        a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank')
+        a.ion-social-twitter(href="//twitter.com/freecodecamp", target='_blank')
             span.sr-only Free Code Camp on Twitter
+        a.ion-social-facebook(href="//facebook.com/freecodecamp", target='_blank')
+            span.sr-only Free Code Camp local groups on Facebook
+        a.ion-social-twitch-outline(href="/twitch", target='_blank')
+            span.sr-only Free Code Camp Live Pair Programming on Twitch.tv
         a.ion-locked(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy")
             span.sr-only Free Code Camp's Privacy Policy
 

From e4f8bff4c10c3534a7d63adcd65221b740088f32 Mon Sep 17 00:00:00 2001
From: M-Bowe <mmb8830@rit.edu>
Date: Tue, 20 Oct 2015 23:09:08 -0400
Subject: [PATCH 128/140] Fix typo in basic-ziplines

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

diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index 4565f364a8..15043e6220 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -35,7 +35,7 @@
         [
           "http://i.imgur.com/Wzt6Y9Y.gif",
           "A gif showing the process of saving and forking a pen.",
-          "Save your pen with the \"Save\" button. Then click the \"Fork\" button. This will create a fork (copy) of your pen that you can experimient with.",
+          "Save your pen with the \"Save\" button. Then click the \"Fork\" button. This will create a fork (copy) of your pen that you can experiment with.",
           ""
         ]
       ],

From fb3d49096009ce9c8fadd04dbd12246e54a704be Mon Sep 17 00:00:00 2001
From: junhaoyap <lordyyap@gmail.com>
Date: Tue, 20 Oct 2015 22:27:27 -0700
Subject: [PATCH 129/140] Add stricter check for CSS selectors styling elements

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

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index c54d12541a..e06df93079 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -377,6 +377,7 @@
         "assert(!$(\"h2\").attr(\"style\"), 'Remove the style attribute from your <code>h2</code> element.')",
         "assert($(\"style\") && $(\"style\").length > 1, 'Create a <code>style</code> element.')",
         "assert($(\"h2\").css(\"color\") === \"rgb(0, 0, 255)\", 'Your <code>h2</code> element should be blue.')",
+        "assert(editor.match(/h2\\s*\\{\\s*color:\\s*blue;\\s*\\}/g), 'Ensure that your stylesheet <code>h2</code> declaration is valid with a semicolon and closing brace')",
         "assert(editor.match(/<\\/style>/g) && editor.match(/<\\/style>/g).length === (editor.match(/<style((\\s)*((type|media|scoped|title|disabled)=\"[^\"]*\")?(\\s)*)*>/g) || []).length, 'Make sure all your <code>style</code> elements are valid and have a closing tag.')"
       ],
       "challengeSeed": [

From ee31bb30a1bab5b35663501bf75420486a029295 Mon Sep 17 00:00:00 2001
From: uwaseem <ubaidillah@iflix.com>
Date: Wed, 21 Oct 2015 22:50:15 +0800
Subject: [PATCH 130/140] Fix typo - changes 'it's attribute' to 'its
 attribute'

---
 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 886bb06b92..e9b43babb3 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -91,7 +91,7 @@
       "id": "bad87fee1348bd9acde08812",
       "title": "Make Images Mobile Responsive",
       "description": [
-        "First, add a new image below the existing one. Set it's <code>src</code> attribute to <code>http://bit.ly/fcc-running-cats</code>.",
+        "First, add a new image below the existing one. Set its <code>src</code> attribute to <code>http://bit.ly/fcc-running-cats</code>.",
         "It would be great if this image could be exactly the width of our phone's screen.",
         "Fortunately, with Bootstrap, all we need to do is add the <code>img-responsive</code> class to your image. Do this, and the image should perfectly fit the width of your page."
       ],

From 286d0c06c4ba25a232510f164f3d64f0310b6b3a Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 21 Oct 2015 12:33:35 -0700
Subject: [PATCH 131/140] further work to make challenges and news navigation
 consistent across mobile and desktop

---
 server/views/stories/hot-stories.jade |  4 ++--
 server/views/stories/news-nav.jade    | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/server/views/stories/hot-stories.jade b/server/views/stories/hot-stories.jade
index 8cc7bb7659..a97da986ef 100644
--- a/server/views/stories/hot-stories.jade
+++ b/server/views/stories/hot-stories.jade
@@ -48,7 +48,7 @@
                                   (typeof username !== 'undefined' ?
                                     "<button id='" + data[i].id + "' class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost btn-upvote'>upvote</button>" :
                                     "<a href='/signin' class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost btn-upvote'>upvote</a>") +
-                                    "<a class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a>" +
+                                    "<a class='hidden' href='/news/" + linkedName + "'>more info</a>" +
                                 "</div>" +
                             "</div>" +
                             "<div class='hidden-xs row media-stories'>" +
@@ -69,7 +69,7 @@
                                                 (typeof username !== 'undefined' ?
                                                   "<button id='" + data[i].id + "' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost btn-upvote'>upvote</button>" :
                                                   "<a href='/signin' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost'>upvote</a>") +
-                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a> · " +
+                                                "<a class='hidden' href='/news/" + linkedName + "'>more info</a> · " +
                                                 rank + (rank > 1 ? " points" : " point") + " · posted " +
                                                 moment(data[i].timePosted).fromNow() +
                                                 " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +
diff --git a/server/views/stories/news-nav.jade b/server/views/stories/news-nav.jade
index 16631279c1..3416335579 100644
--- a/server/views/stories/news-nav.jade
+++ b/server/views/stories/news-nav.jade
@@ -60,7 +60,7 @@ script.
                             "<div class='visible-xs row'>" +
                                 "<div class='visible-xs col-sm-1 col-md-1'>" +
                                     "<a href='" + data[i].link + "'>" +
-                                        "<img class='mobile-story-image img-responsive' src='" + (!!data[i].image ? data[i].image : data[i].author.picture) + "'/>" +
+                                        "<img class='mobile-story-image img-responsive' src='" + data[i].author.picture + "'/>" +
                                     "</a>" +
                                 "</div>" +
                                 "<div class='col-xs-12 mobile-story-headline text-center'>" +
@@ -76,10 +76,6 @@ script.
                                         "<a href='/" + data[i].author.username + "'>@" + data[i].author.username +
                                         "</a> " +
                                     "</div>" +
-                                    "<div class='col-xs-12'>" +
-                                        "<br>" +
-                                        "<a class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost' href='/news/" + linkedName + "'>more info</a>" +
-                                    "</div>" +
                                 "</div>" +
                             "</div>" +
                             "<div class='hidden-xs row media-stories'>" +
@@ -97,10 +93,9 @@ script.
                                                 "</a>" +
                                             "</div>" +
                                             "<div class='story-byline col-xs-12 wrappable'>" +
-                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost' href='/news/" + linkedName + "'>more info</a> · " +
-                                                    rank + (rank > 1 ? " points" : " point") + " · posted " +
-                                                    moment(data[i].timePosted).fromNow() +
-                                                    " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username +
+                                                rank + (rank > 1 ? " points" : " point") + " · posted " +
+                                                moment(data[i].timePosted).fromNow() +
+                                                " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username +
                                                 "</a> " +
                                             "</div>" +
                                         "</div>" +

From 6dfda0166191aad737c6d498d5df522f4b8f520b Mon Sep 17 00:00:00 2001
From: Michael Krebs <vault742@gmail.com>
Date: Wed, 21 Oct 2015 17:15:25 -0400
Subject: [PATCH 132/140] Changes Finders Keepers MDN link from array.some() to
 array.filter()

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

diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index d8b008208d..ea05dd355f 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -633,7 +633,7 @@
         "assert.strictEqual(find([1, 3, 5, 9], function(num) { return num % 2 === 0; }), undefined, 'message: <code>find([1, 3, 5, 9], function(num) { return num % 2 === 0; })</code> should return undefined.');"
       ],
       "MDNlinks": [
-        "Array.some()"
+        "Array.filter()"
       ],
       "type": "bonfire",
       "challengeType": 5,

From 5105efa62492b2e2d56c35e95c21fa871cb4e942 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 21 Oct 2015 15:04:58 -0700
Subject: [PATCH 133/140] add solutions to challenges object and add solutions
 for upper intermediate bonfires

---
 common/models/challenge.json                     | 4 ++++
 seed/challenges/upper-intermediate-bonfires.json | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/common/models/challenge.json b/common/models/challenge.json
index 84cf3a4c6b..81d6af6eef 100644
--- a/common/models/challenge.json
+++ b/common/models/challenge.json
@@ -82,6 +82,10 @@
     },
     "descriptionPt": {
       "type": "array"
+    },
+    "solutions": {
+      "type": "array",
+      "default": []
     }
   },
   "validations": [],
diff --git a/seed/challenges/upper-intermediate-bonfires.json b/seed/challenges/upper-intermediate-bonfires.json
index c09cb30da4..b4ab210cd2 100644
--- a/seed/challenges/upper-intermediate-bonfires.json
+++ b/seed/challenges/upper-intermediate-bonfires.json
@@ -39,6 +39,9 @@
         "Closures",
         "Details of the Object Model"
       ],
+      "solutions": [
+        "var Person = function(firstAndLast) {\n\n  var firstName, lastName;\n\n  function updateName(str) {    \n    firstName = str.split(\" \")[0];\n    lastName = str.split(\" \")[1];    \n  }\n\n  updateName(firstAndLast);\n\n  this.getFirstName = function(){\n    return firstName;\n  };\n  \n  this.getLastName = function(){\n    return lastName;\n  };\n  \n  this.getFullName = function(){\n    return firstName + \" \" + lastName;\n  };\n  \n  this.setFirstName = function(str){\n    firstName = str;\n  };\n  \n\n  this.setLastName = function(str){\n    lastName = str;\n  };\n  \n  this.setFullName = function(str){\n    updateName(str);\n  };\n};\n\nvar bob = new Person('Bob Ross');\nbob.getFullName();"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -80,6 +83,9 @@
       "MDNlinks": [
         "Math.pow()"
       ],
+      "solutions": [
+        "function orbitalPeriod(arr) {\n  var GM = 398600.4418;\n  var earthRadius = 6367.4447;\n  var TAU = 2 * Math.PI; \n  return arr.map(function(obj) {\n    return {\n      name: obj.name,\n      orbitalPeriod: Math.round(TAU * Math.sqrt(Math.pow(obj.avgAlt+earthRadius, 3)/GM))\n    };\n  });\n}\n\norbitalPeriod([{name : \"sputkin\", avgAlt : 35873.5553}]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -120,6 +126,9 @@
         "Array.reduce()"
       ],
       "type": "bonfire",
+      "solutions": [
+        "function pairwise(arr, arg) {\n  var sum = 0;\n  arr.forEach(function(e, i, a) {\n    if (e != null) {      \n      var diff = arg-e;\n      a[i] = null;\n      var dix = a.indexOf(diff);\n      if (dix !== -1) {\n        sum += dix;\n        sum += i;\n        a[dix] = null;\n      }  \n    }\n  });\n  return sum;\n}\n\npairwise([1,4,2,3,0,5], 7);\n"
+      ],
       "challengeType": 5,
       "nameCn": "",
       "descriptionCn": [],

From 1dc0e868b9643abf88c02ebe61d115296ad7a43c Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 21 Oct 2015 21:30:47 -0700
Subject: [PATCH 134/140] update nonprofit files and delete old commented code

---
 seed/nonprofits.json      | 47 ++++++---------------------------------
 server/boot/nonprofits.js | 17 --------------
 2 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/seed/nonprofits.json b/seed/nonprofits.json
index d7b86cf9e9..dd2e8800ec 100644
--- a/seed/nonprofits.json
+++ b/seed/nonprofits.json
@@ -1,6 +1,5 @@
 [
   {
-    "id": "bd7157d8c441cbafaeb5bdef",
     "whatDoesNonprofitDo": "We help the many less-fortunate Jewish families in our community, by providing them with nutritious food and energy to grow, learn, work, and give them hope for a better and brighter future.",
     "websiteLink": "http://chasdeikaduri.org/",
     "name": "Chasdei Kaduri",
@@ -20,7 +19,6 @@
     "moneySaved": 60000
   },
   {
-    "id": "bd7158d8c464cbafaeb4bdef",
     "whatDoesNonprofitDo": "We connect simple technology with last mile communities to reduce poverty.",
     "websiteLink": "http://kopernik.info/",
     "name": "Kopernik",
@@ -36,7 +34,6 @@
     "moneySaved": 20000
   },
   {
-    "id": "bd1326d9c245cbafaeb4bdef",
     "whatDoesNonprofitDo": "We distribute biodegradable toothbrushes globally to children in need.",
     "websiteLink": "http://www.operationbrush.org/",
     "name": "Operation Brush",
@@ -52,7 +49,6 @@
     "moneySaved": 20000
   },
   {
-    "id": "bd1325d8c464cbafaeb5bdef",
     "whatDoesNonprofitDo": "We are the largest roller derby league in the world with around 250 adults and 150 junior skater members plus 500+ volunteers.",
     "websiteLink": "http://www.rosecityrollers.com/about/our-charities/",
     "name": "Rose City Rollers",
@@ -68,7 +64,6 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde1",
     "whatDoesNonprofitDo": "We provide urgently needed pediatric heart surgery and follow-up care for indigent children from developing countries",
     "websiteLink": "http://www.saveachildsheart.com/global/young-leadership-program/",
     "name": "Save a Child's Heart",
@@ -84,7 +79,6 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1225d8c464cbafaeb4bdef",
     "whatDoesNonprofitDo": "We empower youth with technology by providing age appropriate resources and education.",
     "websiteLink": "http://savvycyberkids.org/",
     "name": "Savvy Cyber Kids",
@@ -100,7 +94,6 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb7bcef",
     "whatDoesNonprofitDo": "We bring a new edge to arts and medicine in the Bay Area through powerful live performances of new music to those who feel marginalized by their affliction.",
     "websiteLink": "http://transcendentpathways.org/",
     "name": "Transcendent Pathways",
@@ -116,8 +109,7 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb8bdef",
-    "whatDoesNonprofitDo": "We have provide volunteer matching fairs and silent art auctions at events across Canada. Rather than bid money on artwork, participants bid volunteer hours.",
+     "whatDoesNonprofitDo": "We have provide volunteer matching fairs and silent art auctions at events across Canada. Rather than bid money on artwork, participants bid volunteer hours.",
     "websiteLink": "http://www.timeraiser.ca/",
     "name": "Timeraiser",
     "endUser": "Working professionals who want to donate their time and expertise",
@@ -132,7 +124,6 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb7bdef",
     "whatDoesNonprofitDo": "We focus on raising funds to assist injured homeless animals.",
     "websiteLink": "http://www.peoplesavinganimals.org/",
     "name": "People Saving Animals",
@@ -150,7 +141,6 @@
     "moneySaved": 60000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde2",
     "whatDoesNonprofitDo": "We preserve Florida's health by regulating septic contractors and reviewing logs of sewage collection and disposal.",
     "websiteLink": "http://www.floridahealth.gov/",
     "name": "Florida Department of Health",
@@ -168,8 +158,7 @@
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde3",
-    "whatDoesNonprofitDo": "We strengthen the value of songwriting and independent music in Columbus, Ohio.",
+     "whatDoesNonprofitDo": "We strengthen the value of songwriting and independent music in Columbus, Ohio.",
     "websiteLink": "http://columbussongwritersassociation.com",
     "name": "Columbus Songwriters Association",
     "endUser": "Songwriters and their audiences in the Columbus, Ohio community.",
@@ -184,7 +173,6 @@
     "moneySaved": 20000
   },
   {
-    "id": "bd1325d8c464cbafaeb4bbb",
     "whatDoesNonprofitDo": "We leverage all the benefits of cycling to support and improve the lives of youth and teens in the Triangle region.",
     "websiteLink": "http://www.trianglebikeworks.org",
     "name": "Triangle Bike Works",
@@ -200,7 +188,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4bccc",
     "whatDoesNonprofitDo": "We work to eradicate female genital mutilation in the US and Gambia. We work with survivors and communities.",
     "websiteLink": "http://safehandsforgirls.org/",
     "name": "Safe Hands for Girls",
@@ -216,7 +203,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4beff",
     "whatDoesNonprofitDo": "We're a part of the Department of Psychiatry at Mass General Hospital. We teach an innovative way for helping people that have challenging behaviors.",
     "websiteLink": "http://www.thinkkids.org/",
     "name": "Think Kids at Massachusetts General Hospital",
@@ -232,7 +218,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbaeaeb4bdef",
     "whatDoesNonprofitDo": "We enable, educate, and empower students from rural backgrounds in Uttar Pradesh, India.",
     "websiteLink": "http://www.milaan.in/",
     "name": "Milaan",
@@ -248,7 +233,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4beee",
     "whatDoesNonprofitDo": "We're committed to closing the opportunity gap for children in Baltimore City by providing high quality after school and in-school programs.",
     "websiteLink": "http://childfirstauthority.org/",
     "name": "Child First Authority",
@@ -264,52 +248,42 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4bdef",
     "whatDoesNonprofitDo": "SOLACE Foundation provides drug overdose prevention and awareness training as well as grief support for bereaved families.",
     "websiteLink": "https://www.facebook.com/www.solaceorangecounty.org",
     "name": "The Solace Foundation of Orange County",
     "endUser": "Donors",
-    "approvedDeliverables": ["Website"],
+    "approvedDeliverables": [
+      "Website"
+    ],
     "projectDescription": "Campers will build a basic website that accepts donations.",
     "logoUrl": "http://i.imgur.com/79E3nP0.png",
     "imageUrl": "http://i.imgur.com/kCWN1iT.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 100
   },
   {
-    "id": "bd1325d8c463cbafaeb4bdef",
     "whatDoesNonprofitDo": "We are an interdisciplinary team that works towards harmony among humans and nature through three distinct branches: sustainable agriculture, environmental education and applied and appropriate technology; focused in Líbano, Tolima, Colombia.",
-    "websiteLink": "string",
+    "websiteLink": "",
     "name": "QET America",
     "endUser": "Donors",
     "approvedDeliverables": ["Website"],
     "projectDescription": "Campers will build a multiple language website (English, Spanish) that accepts donations.",
     "logoUrl": "http://i.imgur.com/jPuiPOy.jpg",
     "imageUrl": "http://i.imgur.com/zaaL2pj.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 100
   },
   {
-    "id": "bd1325d8c462cbafaeb4bdef",
     "whatDoesNonprofitDo": "1to1 Movement provides free environmental education in schools",
     "websiteLink": "http://1to1movement.org/",
-    "stakeholderName": "string",
-    "stakeholderEmail": "string",
     "name": "1 to 1 Movement",
     "endUser": "Pledgers",
     "approvedDeliverables": ["Web App"],
     "projectDescription": "Campers will build a simple, social, data-driven application that allows people to see the impact of their actions. User can make a pledge and track the outcome. Will make use of the D3.js visualization library.",
     "logoUrl": "http://i.imgur.com/jaqxg0O.png",
     "imageUrl": "http://i.imgur.com/GXSWTZw.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 300
   },
 
   {
-    "id": "bd1325d8c464cbcfaeb4bdef",
     "whatDoesNonprofitDo": "Our missions is to elevate the national dialogue and engage the American people around climate change policy and the promotion of real clean energy solutions in the United States.",
     "websiteLink": "http://www.usclimateplan.org/",
     "name": "US Climate Plan",
@@ -318,24 +292,17 @@
     "projectDescription": "Campers will build a basic website for sharing information, feeds from different campaign’s websites.",
     "logoUrl": "http://i.imgur.com/uAyUiMN.png",
     "imageUrl": "http://i.imgur.com/2Og5tqy.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 100
   },
   {
-    "id": "bd1325d8c461cbafaeb4bdef",
     "whatDoesNonprofitDo": "We empower the community through improved literacy.",
     "websiteLink": "http://www.tleliteracy.com/",
-    "stakeholderName": "Darlene Brown",
-    "stakeholderEmail": "string",
     "name": "The Learning Exchange",
-    "endUser": "string",
+    "endUser": "Community members",
     "approvedDeliverables": ["Website"],
     "projectDescription": "Campers will build a simple website to replace essentialskillsquebec.com. Site will host many documents related to the Nine Essential Skills.",
     "logoUrl": "http://i.imgur.com/jXQY01H.png",
     "imageUrl": "http://i.imgur.com/iUXBpeL.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
     "estimatedHours": 100
   }
 ]
diff --git a/server/boot/nonprofits.js b/server/boot/nonprofits.js
index 37bb734755..f042f34354 100644
--- a/server/boot/nonprofits.js
+++ b/server/boot/nonprofits.js
@@ -64,23 +64,6 @@ module.exports = function(app) {
           return res.redirect('../nonprofit/' + dashedNameFull);
         }
 
-        //  We need to create logic that verifies completion.
-        //  Defaulting to false for now.
-        //  var buttonActive = false;
-        //  if (
-        //    req.user &&
-        //    req.user.completedCoursewares.length > 63
-        //  ) {
-        //    var hasShownInterest =
-        //      nonprofit.interestedCampers.filter(function(user) {
-        //        return user.username === req.user.username;
-        //      });
-        //
-        //    if (hasShownInterest.length === 0) {
-        //      buttonActive = true;
-        //    }
-        //  }
-
         res.render('nonprofits/show', {
           dashedName: dashedNameFull,
           title: nonprofit.name,

From cbeacbb50c0bad8eda693945a45ff18291c853a3 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 21 Oct 2015 21:32:30 -0700
Subject: [PATCH 135/140] Revert "further work to make challenges and news
 navigation consistent across mobile and desktop"

This reverts commit 286d0c06c4ba25a232510f164f3d64f0310b6b3a.
---
 server/views/stories/hot-stories.jade |  4 ++--
 server/views/stories/news-nav.jade    | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/views/stories/hot-stories.jade b/server/views/stories/hot-stories.jade
index a97da986ef..8cc7bb7659 100644
--- a/server/views/stories/hot-stories.jade
+++ b/server/views/stories/hot-stories.jade
@@ -48,7 +48,7 @@
                                   (typeof username !== 'undefined' ?
                                     "<button id='" + data[i].id + "' class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost btn-upvote'>upvote</button>" :
                                     "<a href='/signin' class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost btn-upvote'>upvote</a>") +
-                                    "<a class='hidden' href='/news/" + linkedName + "'>more info</a>" +
+                                    "<a class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a>" +
                                 "</div>" +
                             "</div>" +
                             "<div class='hidden-xs row media-stories'>" +
@@ -69,7 +69,7 @@
                                                 (typeof username !== 'undefined' ?
                                                   "<button id='" + data[i].id + "' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost btn-upvote'>upvote</button>" :
                                                   "<a href='/signin' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost'>upvote</a>") +
-                                                "<a class='hidden' href='/news/" + linkedName + "'>more info</a> · " +
+                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a> · " +
                                                 rank + (rank > 1 ? " points" : " point") + " · posted " +
                                                 moment(data[i].timePosted).fromNow() +
                                                 " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +
diff --git a/server/views/stories/news-nav.jade b/server/views/stories/news-nav.jade
index 3416335579..16631279c1 100644
--- a/server/views/stories/news-nav.jade
+++ b/server/views/stories/news-nav.jade
@@ -60,7 +60,7 @@ script.
                             "<div class='visible-xs row'>" +
                                 "<div class='visible-xs col-sm-1 col-md-1'>" +
                                     "<a href='" + data[i].link + "'>" +
-                                        "<img class='mobile-story-image img-responsive' src='" + data[i].author.picture + "'/>" +
+                                        "<img class='mobile-story-image img-responsive' src='" + (!!data[i].image ? data[i].image : data[i].author.picture) + "'/>" +
                                     "</a>" +
                                 "</div>" +
                                 "<div class='col-xs-12 mobile-story-headline text-center'>" +
@@ -76,6 +76,10 @@ script.
                                         "<a href='/" + data[i].author.username + "'>@" + data[i].author.username +
                                         "</a> " +
                                     "</div>" +
+                                    "<div class='col-xs-12'>" +
+                                        "<br>" +
+                                        "<a class='btn btn-no-shadow btn-primary btn-block btn-primary-ghost' href='/news/" + linkedName + "'>more info</a>" +
+                                    "</div>" +
                                 "</div>" +
                             "</div>" +
                             "<div class='hidden-xs row media-stories'>" +
@@ -93,9 +97,10 @@ script.
                                                 "</a>" +
                                             "</div>" +
                                             "<div class='story-byline col-xs-12 wrappable'>" +
-                                                rank + (rank > 1 ? " points" : " point") + " · posted " +
-                                                moment(data[i].timePosted).fromNow() +
-                                                " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username +
+                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost' href='/news/" + linkedName + "'>more info</a> · " +
+                                                    rank + (rank > 1 ? " points" : " point") + " · posted " +
+                                                    moment(data[i].timePosted).fromNow() +
+                                                    " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username +
                                                 "</a> " +
                                             "</div>" +
                                         "</div>" +

From c13bdb65e51b111749aad440fc3c12a6472ae1b1 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 6 Oct 2015 23:23:44 -0700
Subject: [PATCH 136/140] Add camper must be auth with gitub to post to news

---
 server/boot/story.js | 47 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/server/boot/story.js b/server/boot/story.js
index d46b79f079..6e1ca30202 100755
--- a/server/boot/story.js
+++ b/server/boot/story.js
@@ -12,13 +12,18 @@ var Rx = require('rx'),
     validator = require('validator'),
     secrets = require('../../config/secrets');
 
-var foundationDate = 1413298800000;
-var time48Hours = 172800000;
+import {
+  ifNoUser401,
+  ifNoUserRedirectTo
+} from '../utils/middleware';
 
-var unDasherize = utils.unDasherize;
-var dasherize = utils.dasherize;
-var getURLTitle = utils.getURLTitle;
-var ifNoUser401 = require('../utils/middleware').ifNoUser401;
+const foundationDate = 1413298800000;
+const time48Hours = 172800000;
+
+const unDasherize = utils.unDasherize;
+const dasherize = utils.dasherize;
+const getURLTitle = utils.getURLTitle;
+const sendNonUserToNews = ifNoUserRedirectTo('/news');
 
 function hotRank(timeValue, rank) {
   /*
@@ -62,8 +67,16 @@ module.exports = function(app) {
 
   router.get('/news/hot', hotJSON);
   router.get('/stories/hotStories', hotJSON);
-  router.get('/stories/submit', submitNew);
-  router.get('/stories/submit/new-story', preSubmit);
+  router.get(
+    '/stories/submit',
+    sendNonUserToNews,
+    submitNew
+  );
+  router.get(
+    '/stories/submit/new-story',
+    sendNonUserToNews,
+    preSubmit
+  );
   router.post('/stories/preliminary', ifNoUser401, newStory);
   router.post('/stories/', ifNoUser401, storySubmission);
   router.get('/news/', hot);
@@ -102,17 +115,24 @@ module.exports = function(app) {
   }
 
   function submitNew(req, res) {
+    if (!req.user.isGithubCool) {
+      req.flash('errors', {
+        msg: 'You must authenticate with Github to post to Camper News'
+      });
+      return res.redirect('/news');
+    }
+
     return res.render('stories/index', {
       title: 'Submit a new story to Camper News',
       page: 'submit'
     });
   }
 
-  function preSubmit(req, res, next) {
+  function preSubmit(req, res) {
     var data = req.query;
     if (typeof data.url !== 'string') {
       req.flash('errors', { msg: 'No URL supplied with story' });
-      return next(new TypeError('No URL supplied with story'));
+      return res.redirect('/news');
     }
     var cleanedData = cleanData(data.url);
 
@@ -264,8 +284,11 @@ module.exports = function(app) {
   }
 
   function newStory(req, res, next) {
-    if (!req.user) {
-      return next(new Error('Must be logged in'));
+    if (!req.user.isGithubCool) {
+      req.flash('errors', {
+        msg: 'You must authenticate with Github to post to Camper News'
+      });
+      return res.redirect('/news');
     }
     var url = req.body.data.url;
 

From d8ebb7bf387329122c7aca2220ec07b8a2b4b3d1 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 22 Oct 2015 02:14:34 -0700
Subject: [PATCH 137/140] update weather challenge with api key

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

diff --git a/seed/challenges/intermediate-ziplines.json b/seed/challenges/intermediate-ziplines.json
index fd3ea5b5e9..0d2afbcb5c 100644
--- a/seed/challenges/intermediate-ziplines.json
+++ b/seed/challenges/intermediate-ziplines.json
@@ -8,7 +8,7 @@
       "title": "Show the Local Weather",
       "challengeSeed": ["126415127"],
       "description": [
-        "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> app that successfully reverse-engineers this: <a href='http://codepen.io/AdventureBear/full/yNBJRj' target='_blank'>http://codepen.io/AdventureBear/full/yNBJRj</a>.",
+        "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> app that successfully reverse-engineers this: <a href='http://codepen.io/FreeCodeCamp/pen/avqvgJ' target='_blank'>http://codepen.io/FreeCodeCamp/pen/avqvgJ</a>.",
         "<span class='text-info'>Rule #1:</span> Don't look at the example project's code on CodePen. Figure it out for yourself.",
         "<span class='text-info'>Rule #2:</span> You may use whichever libraries or APIs you need.",
         "<span class='text-info'>Rule #3:</span> Reverse engineer the example project's functionality, and also feel free to personalize it.",
@@ -17,6 +17,7 @@
         "<span class='text-info'>Bonus User Story:</span> As a user, I can see an icon depending on the weather.",
         "<span class='text-info'>Bonus User Story:</span> As a user, I see a different background image (e.g. snowy mountain, hot desert) depending on the weather.",
         "<span class='text-info'>Bonus User Story:</span> As a user, I can push a button to toggle between Fahrenheit and Celsius.",
+        "We recommend using the <a href='http://openweathermap.org/current#geo' target='_blank'>Open Weather API</a>. This will require creating a free API key. Normally you want to avoid exposing API keys on CodePen, but we haven't been able to find a keyless API for weather.",
         "Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a> if you get stuck.",
         "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 from fellow campers, click this button and paste in a link to your CodePen project. <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:%20PASTE_YOUR_CODEPEN_URL_HERE%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"

From e7cae04c52d0e83027923fcb95fa84ae73ce8f99 Mon Sep 17 00:00:00 2001
From: natac13 <sean.campbell13@gmail.com>
Date: Thu, 22 Oct 2015 17:32:40 -0400
Subject: [PATCH 138/140] fixed unclear description for jQuery challenge using
 all selectors suggested by @trs4ece

closes #3845
---
 seed/challenges/jquery.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index d4625a85a4..b0280aa0c3 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -255,8 +255,10 @@
       "title": "Target the same element with multiple jQuery Selectors",
       "description": [
         "Now you know three ways of targeting elements: by type: <code>$(\"button\")</code>, by class: <code>$(\".btn\")</code>, and by id <code>$(\"#target1\")</code>.",
-        "Use each of these jQuery selectors to target your <code>button</code> element with the class <code>btn</code> and the id <code>target1</code>.",
-        "Use the <code>addClass()</code> jQuery function to give the element one new class for each selector: <code>animated</code>, <code>shake</code>, and <code>btn-primary</code>."
+        "Using each of the above jQuery selectors and the <code>addClass()</code> function:",
+        "Add the <code>animated</code> class to all elements with type <code>button</code>.",
+        "Add the <code>shake</code> class to all the buttons with class <code>.btn</code>.",
+        "Add the <code>btn-primary</code> class to the button with id <code>#target1</code>."
       ],
       "tests": [
         "assert(editor.match(/\\$\\s*?\\(\\s*?(?:'|\")\\s*?button\\s*?(?:'|\")/gi), 'Use the <code>$&#40\"button\"&#41</code> selector.')",

From 49101183663ffca913880f507a3071bdb4e86339 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 23 Oct 2015 14:12:09 -0700
Subject: [PATCH 139/140] update flash message

---
 server/boot/story.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/boot/story.js b/server/boot/story.js
index 6e1ca30202..c1f188db81 100755
--- a/server/boot/story.js
+++ b/server/boot/story.js
@@ -117,7 +117,8 @@ module.exports = function(app) {
   function submitNew(req, res) {
     if (!req.user.isGithubCool) {
       req.flash('errors', {
-        msg: 'You must authenticate with Github to post to Camper News'
+        msg: 'You must link GitHub with your account before you can post' +
+          ' on Camper News.'
       });
       return res.redirect('/news');
     }

From 2ac70458b0016abfca1c3603a42c9c9fc6b50162 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 23 Oct 2015 14:28:27 -0700
Subject: [PATCH 140/140] remove unnecessary bullet point from Camper News view

---
 server/views/stories/hot-stories.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/views/stories/hot-stories.jade b/server/views/stories/hot-stories.jade
index 8cc7bb7659..9d512f8a8b 100644
--- a/server/views/stories/hot-stories.jade
+++ b/server/views/stories/hot-stories.jade
@@ -69,7 +69,7 @@
                                                 (typeof username !== 'undefined' ?
                                                   "<button id='" + data[i].id + "' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost btn-upvote'>upvote</button>" :
                                                   "<a href='/signin' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost'>upvote</a>") +
-                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a> · " +
+                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a> &nbsp; " +
                                                 rank + (rank > 1 ? " points" : " point") + " · posted " +
                                                 moment(data[i].timePosted).fromNow() +
                                                 " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +