From b4afc3430a0c364242fc1399fcf2e64b1bf53e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADnez?= <jbmartinezs@yahoo.com>
Date: Sun, 16 Aug 2015 21:11:36 +0000
Subject: [PATCH 01/54] Fixed #1090

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

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 4d4ae95cad..e25c317578 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -867,8 +867,8 @@
       "tests": [
         "assert($(\"img\").hasClass(\"smaller-image\"), 'Your <code>img</code> element should have the class <code>smaller-image</code>.')",
         "assert($(\"img\").hasClass(\"thick-green-border\"), 'Your <code>img</code> element should have the class <code>thick-green-border</code>.')",
-        "assert($(\"img\").hasClass(\"thick-green-border\") && parseInt($(\"img\").css(\"border-top-width\")), 'Give your image a border width of <code>10px</code>.')",
-        "assert(new RegExp(\"solid\", \"gi\").test(editor), 'Give your image a border style of <code>solid</code>.')",
+        "assert($(\"img\").hasClass(\"thick-green-border\") && parseInt($(\"img\").css(\"border-top-width\"), 10) === 10, 'Give your image a border width of <code>10px</code>.')",
+        "assert($(\"img\").css(\"border-right-style\") === \"solid\", 'Give your image a border style of <code>solid</code>.')",
         "assert($(\"img\").css(\"border-left-color\") === \"rgb(0, 128, 0)\", 'The border around your <code>img</code> element should be green.')"
       ],
       "challengeSeed": [

From 2fade59319e08b26941261ecbbbd7206b0fe23e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADnez?= <jbm.public@yahoo.com>
Date: Mon, 17 Aug 2015 16:01:51 +0000
Subject: [PATCH 02/54] Changed test case for Waypoint: target elements by id

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

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index f2dfcb08e1..cd059066b1 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -161,7 +161,7 @@
       ],
       "tests": [
         "assert($(\"#target3\").hasClass(\"animated\"), 'Select the <code>button</code>element with the <code>id</code> of <code>target3</code> and use the jQuery <code>addClass&#40&#41</code> function to give it the class of <code>animated</code>.');",
-        "assert($(\"#target3\").hasClass(\"fadeOut\") || $(\"#target3\").hasClass(\"fadeout\"), 'Target the element with the id <code>target3</code> and use the jQuery <code>addClass&#40&#41</code> function to give it the class <code>fadeOut</code>.')",
+        "assert(($(\"#target3\").hasClass(\"fadeOut\") || $(\"#target3\").hasClass(\"fadeout\"))  && editor.match(/\\$\\(.#target3.\\)/g), 'Target the element with the id <code>target3</code> and use the jQuery <code>addClass&#40&#41</code> function to give it the class <code>fadeOut</code>.');",
         "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [

From 23139ff45fbe0a936fff2d8d9e927b1fb3bce5c4 Mon Sep 17 00:00:00 2001
From: Mark Surnin <marks@Marks-MBP.connectify>
Date: Thu, 20 Aug 2015 12:01:38 +0500
Subject: [PATCH 03/54] Added a test for factorial(0) to be equal to 1.

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

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 6f1cf7b9d4..84f92e15dd 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -90,7 +90,8 @@
         "expect(factorialize(5)).to.be.a(\"Number\");",
         "expect(factorialize(5)).to.equal(120);",
         "expect(factorialize(10)).to.equal(3628800);",
-        "expect(factorialize(20)).to.equal(2432902008176640000);"
+        "expect(factorialize(20)).to.equal(2432902008176640000);",
+        "expect(factorialize(0)).to.equal(1);"
       ],
       "difficulty": "1.02",
       "description": [

From 636e16d5221fb59414875a89dffcdd4417a47cd3 Mon Sep 17 00:00:00 2001
From: Ionut Costica <ionut.costica@gmail.com>
Date: Fri, 21 Aug 2015 15:18:40 +0300
Subject: [PATCH 04/54] [Waypoint: Remove Classes from an element with jQuery]
 usually expected to not validate if using removeClass() without parameters

Added extra test to the waypoint to check if `.removeClass` was used with the `"btn-default"` parameter as most people expect to have to do (and are confused when the code validates before they've finished writing their function, as seen by the myriad of issues opened about it).

Closes #2302
Closes #2402
Closes #2301
Closes #2197
Closes #2160
Closes #1923
Closes #1898
---
 seed/challenges/jquery.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index aecaf645a6..99a8984a85 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -314,7 +314,8 @@
       ],
       "tests": [
         "assert($(\".btn-default\").length === 0, 'Remove the <code>btn-default</code> class from all of your <code>button</code> elements.')",
-        "assert(editor.match(/btn btn-default/g), 'Only use jQuery to remove this class from the element.')"
+        "assert(editor.match(/btn btn-default/g), 'Only use jQuery to remove this class from the element.')",
+        "assert(editor.match(/\\.[\\v\\s]*removeClass[\\s\\v]*\\([\\s\\v]*('|\")\\s*btn-default\\s*('|\")[\\s\\v]*\\)/gm), 'Only remove the <code>btn-default</code> class.'"
       ],
       "challengeSeed": [
         "fccss",

From 0132a1afcae227ea80934ae61e64e0c7d2c81bc5 Mon Sep 17 00:00:00 2001
From: Jakob Dahl <jakobdahl@gmail.com>
Date: Fri, 21 Aug 2015 17:45:30 +0200
Subject: [PATCH 05/54] 2324 for id attributes to be under relevant parents

---
 seed/challenges/bootstrap.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index da7a510236..a447d6bffa 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -1949,8 +1949,8 @@
         "Give the well on the left the id of <code>left-well</code>. Give the well on the right the <code>id</code> of <code>right-well</code>."
       ],
       "tests": [
-        "assert($(\"#left-well\") && $(\"#left-well\").length > 0, 'Give your left <code>well</code> the id of <code>left-well</code>.')",
-        "assert($(\"#right-well\") && $(\"#right-well\").length > 0, 'Give your right <code>well</code> the id of <code>right-well</code>.')"
+        "assert($(\".col-xs-6\").children(\"#left-well\") && $(\".col-xs-6\").children(\"#left-well\").length > 0, 'Give your left <code>well</code> the id of <code>left-well</code>.')",
+        "assert($(\".col-xs-6\").children(\"#right-well\") && $(\".col-xs-6\").children(\"#right-well\").length > 0, 'Give your right <code>well</code> the id of <code>right-well</code>.')"
       ],
       "challengeSeed": [
         "<div class=\"container-fluid\">",
@@ -2046,12 +2046,12 @@
         "Give each of your buttons a unique id like, starting with <code>target1</code> and ending with <code>target6</code>."
       ],
       "tests": [
-        "assert($(\"#target1\") && $(\"#target1\").length > 0, 'One <code>button</code> element should have the id <code>target1</code>.')",
-        "assert($(\"#target2\") && $(\"#target2\").length > 0, 'One <code>button</code> element should have the id <code>target2</code>.')",
-        "assert($(\"#target3\") && $(\"#target3\").length > 0, 'One <code>button</code> element should have the id <code>target3</code>.')",
-        "assert($(\"#target4\") && $(\"#target4\").length > 0, 'One <code>button</code> element should have the id <code>target4</code>.')",
-        "assert($(\"#target5\") && $(\"#target5\").length > 0, 'One <code>button</code> element should have the id <code>target5</code>.')",
-        "assert($(\"#target6\") && $(\"#target6\").length > 0, 'One <code>button</code> element should have the id <code>target6</code>.')"
+        "assert($(\"#left-well\").children(\"#target1\") && $(\"#left-well\").children(\"#target1\").length > 0, 'One <code>button</code> element should have the id <code>target1</code>.')",
+        "assert($(\"#left-well\").children(\"#target2\") && $(\"#left-well\").children(\"#target2\").length > 0, 'One <code>button</code> element should have the id <code>target2</code>.')",
+        "assert($(\"#left-well\").children(\"#target3\") && $(\"#left-well\").children(\"#target3\").length > 0, 'One <code>button</code> element should have the id <code>target3</code>.')",
+        "assert($(\"#right-well\").children(\"#target4\") && $(\"#right-well\").children(\"#target4\").length > 0, 'One <code>button</code> element should have the id <code>target4</code>.')",
+        "assert($(\"#right-well\").children(\"#target5\") && $(\"#right-well\").children(\"#target5\").length > 0, 'One <code>button</code> element should have the id <code>target5</code>.')",
+        "assert($(\"#right-well\").children(\"#target6\") && $(\"#right-well\").children(\"#target6\").length > 0, 'One <code>button</code> element should have the id <code>target6</code>.')"
       ],
       "challengeSeed": [
         "<div class=\"container-fluid\">",

From 67158e876db1da0ed05dddd9e5557ee840b676b1 Mon Sep 17 00:00:00 2001
From: ahstro <anton@lutic.org>
Date: Sun, 23 Aug 2015 15:18:17 +0200
Subject: [PATCH 06/54] Check all children instead of just one in 'Target
 Children with jQuery'

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

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index 8576e4bc0d..75de836abf 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -679,7 +679,7 @@
         "Here's an example of how you would use the <code>children()</code> function: <code>$(\"#left-well\").children().css(\"color\", \"blue\")</code>"
       ],
       "tests": [
-        "assert($(\"#target6\").css(\"color\") === 'rgb(0, 128, 0)', 'Your <code>target6</code> element should have green text.')",
+        "assert($(\"#right-well\").children().css(\"color\") === 'rgb(0, 128, 0)', 'All children of <code>#right-well</code> should have green text.')",
         "assert(editor.match(/\\.children\\(\\)\\.css/g), 'You should use the <code>children&#40&#41</code> function to modify these elements.')",
         "assert(editor.match(/<div class=\"well\" id=\"right-well\">/g), 'Only use jQuery to add these classes to the element.')"
       ],

From 16579fdd4b270e2aa9f33ab94a8080e0565a7dda Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Wed, 26 Aug 2015 11:51:36 +0400
Subject: [PATCH 07/54] Fixes indoor, personality and label issues

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

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index e55619b87b..0463430e38 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -1998,8 +1998,8 @@
       ],
       "tests": [
         "assert($('input[type=\"radio\"]').length > 1, 'Your page should have two radio button elements.')",
-        "assert($('input[type=\"radio\"]:nth-child(1)').attr('name') === 'indoor-outdoor', 'Give your radio buttons the <code>name</code> attribute of <code>indoor-outdoor</code>.')",
-        "assert($(\"label\").length > 1, 'Each of your two radio button elements should be nested in a <code>label</code> element.')",
+        "assert($('label > input[type=\"radio\"]').filter(\"[name='indoor-outdoor']\").length > 1, 'Give your radio buttons the <code>name</code> attribute of <code>indoor-outdoor</code>.')",
+        "assert($('label > input[type=\"radio\"]:only-child').length > 1, 'Each of your two radio button elements should be nested in its own <code>label</code> element.')",
         "assert(editor.match(/<\\/label>/g) && editor.match(/<label/g) && editor.match(/<\\/label>/g).length === editor.match(/<label/g).length, 'Make sure each of your <code>label</code> elements has a closing tag.')",
         "assert($(\"label\").text().match(/indoor/gi), 'One of your radio buttons should have the label <code>indoor</code>.')",
         "assert($(\"label\").text().match(/outdoor/gi), 'One of your radio buttons should have the label <code>outdoor</code>.')"
@@ -2091,9 +2091,9 @@
       ],
       "tests": [
         "assert($('input[type=\"checkbox\"]').length > 2, 'Your page should have three checkbox elements.')",
-        "assert($('label:has(input[type=\"checkbox\"])').length > 2, 'Each of your three checkbox elements should be nested in its own <code>label</code> element.')",
+        "assert($('label > input[type=\"checkbox\"]:only-child').length > 2, 'Each of your three checkbox elements should be nested in its own <code>label</code> element.')",
         "assert(editor.match(/<\\/label>/g) && editor.match(/<label/g) && editor.match(/<\\/label>/g).length === editor.match(/<label/g).length, \"Make sure each of your <code>label</code> elements has a closing tag.\")",
-        "assert($('input[type=\"checkbox\"]:nth-child(1)').attr(\"name\") === \"personality\", 'Give your checkboxes buttons the <code>name</code> attribute of <code>personality</code>.')"
+        "assert($('label > input[type=\"checkbox\"]').filter(\"[name='personality']\").length > 2, 'Give your checkboxes buttons the <code>name</code> attribute of <code>personality</code>.')"
       ],
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",

From 5ac2902b4654451c4cf5d211d774e519ae1ba801 Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Wed, 26 Aug 2015 12:11:40 +0400
Subject: [PATCH 08/54] Fixes a word typo

---
 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 0463430e38..0c9085bca2 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -2093,7 +2093,7 @@
         "assert($('input[type=\"checkbox\"]').length > 2, 'Your page should have three checkbox elements.')",
         "assert($('label > input[type=\"checkbox\"]:only-child').length > 2, 'Each of your three checkbox elements should be nested in its own <code>label</code> element.')",
         "assert(editor.match(/<\\/label>/g) && editor.match(/<label/g) && editor.match(/<\\/label>/g).length === editor.match(/<label/g).length, \"Make sure each of your <code>label</code> elements has a closing tag.\")",
-        "assert($('label > input[type=\"checkbox\"]').filter(\"[name='personality']\").length > 2, 'Give your checkboxes buttons the <code>name</code> attribute of <code>personality</code>.')"
+        "assert($('label > input[type=\"checkbox\"]').filter(\"[name='personality']\").length > 2, 'Give your checkboxes the <code>name</code> attribute of <code>personality</code>.')"
       ],
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",

From 172543e670e92be6b6b1f5b80360c7ac074fc71b Mon Sep 17 00:00:00 2001
From: Ionut Costica <ionut.costica@gmail.com>
Date: Wed, 26 Aug 2015 13:52:40 +0300
Subject: [PATCH 09/54] Fixed ")" error

Somehow the assert's closing paren got deleted :")
---
 seed/challenges/jquery.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index 99a8984a85..f863a77bf9 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -315,7 +315,7 @@
       "tests": [
         "assert($(\".btn-default\").length === 0, 'Remove the <code>btn-default</code> class from all of your <code>button</code> elements.')",
         "assert(editor.match(/btn btn-default/g), 'Only use jQuery to remove this class from the element.')",
-        "assert(editor.match(/\\.[\\v\\s]*removeClass[\\s\\v]*\\([\\s\\v]*('|\")\\s*btn-default\\s*('|\")[\\s\\v]*\\)/gm), 'Only remove the <code>btn-default</code> class.'"
+        "assert(editor.match(/\\.[\\v\\s]*removeClass[\\s\\v]*\\([\\s\\v]*('|\")\\s*btn-default\\s*('|\")[\\s\\v]*\\)/gm), 'Only remove the <code>btn-default</code> class.')"
       ],
       "challengeSeed": [
         "fccss",

From b24f36774990c30a95b313b7435e2919ff062bb9 Mon Sep 17 00:00:00 2001
From: Arsen Melikyan <bugron@users.noreply.github.com>
Date: Wed, 26 Aug 2015 18:59:59 +0400
Subject: [PATCH 10/54] Changes nonexistent variable name to proper one

---
 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 3465c9dcb1..cc8906b39b 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -249,7 +249,7 @@
         "In order to get the last letter of a string, you can subtract one from the string's length.",
         "For example, you can get the value of the third-to-last letter of the <code>var firstName = \"Charles\"</code> string by using <code>firstName[firstName.length - 3]</code>.",
         "Use <code>bracket notation</code> to find the second-to-last character in the <code>lastName</code> string.",
-        "Try looking at the <code>lastLetterOfLastName</code> variable declaration if you get stuck."
+        "Try looking at the <code>thirdToLastLetterOfFirstName</code> variable declaration if you get stuck."
       ],
       "tests": [
         "assert(secondToLastLetterOfLastName === 'c', 'secondToLastLetterOfLastName should be \"c\".');",

From 8d369615f686bbec113e891fe11a4c35f43e03dd Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Thu, 27 Aug 2015 23:19:09 +0400
Subject: [PATCH 11/54] combines two tests in one

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

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 9142e952cc..5e3091a7b4 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -1747,9 +1747,8 @@
       ],
       "tests": [
         "assert($(\"form\") && $(\"form\").children(\"input\") && $(\"form\").children(\"input\").length > 0, 'Nest your text input element within a <code>form</code> element.')",
-        "assert($(\"form\").attr(\"action\"), 'Your <code>form</code> element should have an <code>action</code> attribute.')",
-        "assert(editor.match(/<\\/form>/g) && editor.match(/<form/g) && editor.match(/<\\/form>/g).length === editor.match(/<form/g).length, 'Make sure your <code>form</code> element has a closing tag.')",
-        "assert(editor.match(/\\/submit-cat-photo/ig), 'Make sure your <code>form</code> action is set to <code>/submit-cat-photo</code>.')"
+        "assert($(\"form\").attr(\"action\") === \"/submit-cat-photo\", 'Make sure your <code>form</code> has an <code>action</code> attribute which is set to <code>/submit-cat-photo</code>.')",
+        "assert(editor.match(/<\\/form>/g) && editor.match(/<form/g) && editor.match(/<\\/form>/g).length === editor.match(/<form/g).length, 'Make sure your <code>form</code> element has a closing tag.')"
       ],
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",

From 00046fc038c003d8b07c1daa8253f7fbfaa21d99 Mon Sep 17 00:00:00 2001
From: Dmytro Yarmak <dmytroy@backbase.com>
Date: Mon, 31 Aug 2015 10:52:48 +0300
Subject: [PATCH 12/54] Fix assertions for Bonfire: Symmetric Difference

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

diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index 62a5f2cd3c..b20b350c9b 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -80,10 +80,10 @@
         "sym([1, 2, 3], [5, 2, 1, 4]);"
       ],
       "tests": [
-        "assert.deepEqual(sym([1, 2, 3], [5, 2, 1, 4]), [3, 5, 4], 'should return an array of unique values');",
-        "assert.deepEqual(sym([1, 2, 5], [2, 3, 5], [3, 4, 5]), [1, 4, 5], 'should return the symmetric difference of the given arrays');",
-        "assert.deepEqual(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'should return an array of unique values');",
-        "assert.deepEqual(sym([1, 1]), [1], 'should return an array of unique values');"
+        "assert.sameMembers(sym([1, 2, 3], [5, 2, 1, 4]), [3, 5, 4], 'should return an array of unique values');",
+        "assert.sameMembers(sym([1, 2, 5], [2, 3, 5], [3, 4, 5]), [1, 4, 5], 'should return the symmetric difference of the given arrays');",
+        "assert.sameMembers(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'should return an array of unique values');",
+        "assert.sameMembers(sym([1, 1]), [1], 'should return an array of unique values');"
       ],
       "MDNlinks": [
         "Array.reduce()",

From 8fdacb7e346ba71ca7b244035afe4c194ff53997 Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Tue, 1 Sep 2015 07:18:44 +0400
Subject: [PATCH 13/54] This commit extends 'Bug' button's functionality

---
 client/main.js                              | 14 +++++++++++++-
 server/views/partials/challenge-modals.jade | 11 +++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/client/main.js b/client/main.js
index 8a72664bbf..a74e8d1c94 100644
--- a/client/main.js
+++ b/client/main.js
@@ -66,10 +66,22 @@ $(document).ready(function() {
         }, 200);
       });
 
+      $('#search-issue').unbind('click');
+      $('#search-issue').on('click', function() {
+          var queryIssue = window.location.href.toString();
+          $('#issue-modal').modal('hide');
+          window.open('https://github.com/FreeCodeCamp/FreeCodeCamp/issues?q=is:issue is:all '+ queryIssue.substr(queryIssue.lastIndexOf('challenges/') + 11).replace('/', ''), '_blank');
+      });
+
       $('#report-issue').unbind('click');
       $('#report-issue').on('click', function() {
+          var textMessage = 'https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge ' + window.location.href + ' has an issue. Please describe how to reproduce it, and include links to screenshots if possible.';
+          if($('#user-agent-checkbox').is(':checked')) {
+            textMessage += ' My User Agent is: <code>' + navigator.userAgent + '</code>';
+            textMessage = textMessage.replace(';', ','); //GitHub cuts User Agent text because of ';' symbol so I just replace it with ','
+          }
           $('#issue-modal').modal('hide');
-          window.open('https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge '+ window.location.href +' has an issue. Please describe how to reproduce it, and include links to screenshots if possible.', '_blank')
+          window.open(textMessage, '_blank');
       });
 
       $('#completed-courseware').unbind('click');
diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade
index 21244c383d..c4b509d3fc 100644
--- a/server/views/partials/challenge-modals.jade
+++ b/server/views/partials/challenge-modals.jade
@@ -20,6 +20,17 @@
             .modal-body.text-center
                 h3 This will open our GitHub Issues page.
                 h3 Please tell us how to reproduce the bug and link us to screenshots if possible.
+                h4.row
+                    .col-xs-1.col-sm-1.col-md-1
+                        input#user-agent-checkbox(type='checkbox') 
+                    .col-xs-11.col-sm-11.col-md-11
+                        label.text-warning.bg-info(for='user-agent-checkbox' style='cursor:pointer;') Include your OS and Browser version in the text of issue to provide more detailed information
+                h3 It's recommended first to search issues in GitHub. It could be a similar issue opened or already solved!
+                h3 
+                    | Also take a look at this helpful Wiki article: 
+                    br
+                    a(href='https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I%27ve-Found-a-Bug', target='_blank') Help I've Found a Bug
+                a.btn.btn-lg.btn-success.btn-block#search-issue(name='_csrf', value=_csrf) Search issues on this challenge in GitHub
                 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
 

From 3cb16bfa1829c421dce63e0bc7a26788965c8306 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Mon, 31 Aug 2015 22:48:20 -0700
Subject: [PATCH 14/54] fix codeStorage not saving on keyUp events

closes #2894
---
 client/commonFramework.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index dd91756e06..8eb2377703 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -200,7 +200,7 @@ var myCodeMirror = editor;
 editor.on('keyup', function() {
   clearTimeout(codeStorage.updateTimeoutId);
   codeStorage.updateTimeoutId = setTimeout(
-    codeStorage.updateStorage,
+    codeStorage.updateStorage.bind(codeStorage),
     codeStorage.updateWait
   );
 });

From bdd2803923b955ce9e97a78f0da1c0a557bf3f68 Mon Sep 17 00:00:00 2001
From: Dmytro Yarmak <dmytroy@backbase.com>
Date: Tue, 1 Sep 2015 13:41:40 +0300
Subject: [PATCH 15/54] Add output block to "Iterate with JavaScript For Loops"
 challange

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

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index a4c3cabdb9..11c6b67e72 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -824,8 +824,15 @@
         "  ourArray.push(i);",
         "}",
         "var myArray = [];",
-        "//Push the numbers zero through four to myArray using a \"for loop\" like above.",
         "",
+        "// Only change code below this line.",
+        "",
+        "// Push the numbers zero through four to myArray using a \"for loop\" like above.",
+        "",
+        "// Only change code above this line.",
+        "// We use this function to show you the value of your variable in your output box.",
+        "// You'll learn about functions soon.",
+        "if(typeof(myArray) !== \"undefined\"){(function(){return myArray;})();}",
         ""
       ],
       "type": "waypoint",

From 887722d5c8c079c1edfef70eb76a7fd2dd8946b6 Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Tue, 1 Sep 2015 17:13:16 +0400
Subject: [PATCH 16/54] checkbox is now checked by default

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

diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade
index c4b509d3fc..43a102f704 100644
--- a/server/views/partials/challenge-modals.jade
+++ b/server/views/partials/challenge-modals.jade
@@ -22,7 +22,7 @@
                 h3 Please tell us how to reproduce the bug and link us to screenshots if possible.
                 h4.row
                     .col-xs-1.col-sm-1.col-md-1
-                        input#user-agent-checkbox(type='checkbox') 
+                        input#user-agent-checkbox(type='checkbox', checked) 
                     .col-xs-11.col-sm-11.col-md-11
                         label.text-warning.bg-info(for='user-agent-checkbox' style='cursor:pointer;') Include your OS and Browser version in the text of issue to provide more detailed information
                 h3 It's recommended first to search issues in GitHub. It could be a similar issue opened or already solved!

From dd5feb4a2c00bc4b4249722ed696e7b8ecc6601b Mon Sep 17 00:00:00 2001
From: Dmytro Yarmak <dmytroy@backbase.com>
Date: Wed, 2 Sep 2015 23:17:33 +0300
Subject: [PATCH 17/54] Improve test cases for Generate Random Whole Numbers
 within a Range

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

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index a4c3cabdb9..a26a417c87 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -936,6 +936,7 @@
       "tests":[
         "assert(myFunction() >= min, 'The random number that\\'s generated by myFunction should be greater than or equal to the minimum number');",
         "assert(myFunction() <= max, 'The random number that\\'s generated by myFunction should be less than or equal to the maximum number');",
+        "assert(myFunction() % 1 === 0 , 'The random number that\\'s generated by myFunction should be an integer');",
         "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;}})(), 'You should be using the function given in the description to calculate the random in number in a range');"
       ],
       "challengeSeed":[

From 9496152e00e2d8c28287528dcd830f25e73696ae Mon Sep 17 00:00:00 2001
From: Natac13 <Natac13@user.noreply.github.com>
Date: Thu, 3 Sep 2015 14:02:44 -0400
Subject: [PATCH 18/54] fixes filter function return conditional closes #3031

---
 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 6d6b1e15e4..b7701304f1 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -236,7 +236,7 @@
         "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<4;</code>",
+        "<code>&thinsp;&thinsp;return val <= 5;</code>",
         "<code>});</code>"
       ],
       "tests":[

From 6d39433aea2c5de9f9f9bae8907e1f9a4c45dd4b Mon Sep 17 00:00:00 2001
From: Natac13 <Natac13@user.noreply.github.com>
Date: Thu, 3 Sep 2015 18:21:36 -0400
Subject: [PATCH 19/54] Attempt to fix unclear description Where Art Thou
 closes #3038

---
 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 32964b0378..9d860d3d12 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -569,7 +569,7 @@
       "title": "Where art thou",
       "difficulty": "1.55",
       "description": [
-        "Make a function that looks through an array (first argument) and returns an array of all objects that have equivalent property and value pair (second argument).",
+        "Make a function that looks through an array of objects (first argument) and returns an array of all objects that have matching property and value pairs (second argument). Each property and value pair of the source object has to be present in the object from the collection if it is to be included in the returned array.",
         "For example, if the first argument is <code>[{ first: 'Romeo', last: 'Montague' }, { first: 'Mercutio', last: null }, { first: 'Tybalt', last: 'Capulet' }]</code>, and the second argument is <code>{ last: 'Capulet' }</code>, then you must return the the third object from the array (the first argument), because it contains the property and it's value, that was passed on as the second argument.",
         "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."
       ],

From 113a3f5456a8103d4a22e0291e410b01a68affde Mon Sep 17 00:00:00 2001
From: ahstro <anton@lutic.org>
Date: Fri, 4 Sep 2015 09:55:07 +0200
Subject: [PATCH 20/54] Updated ExpressWorks exercises in waypoint

---
 seed/challenges/nodejs-and-expressjs.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/seed/challenges/nodejs-and-expressjs.json b/seed/challenges/nodejs-and-expressjs.json
index c8364e4e36..a1dccae476 100644
--- a/seed/challenges/nodejs-and-expressjs.json
+++ b/seed/challenges/nodejs-and-expressjs.json
@@ -177,11 +177,13 @@
         "Note that you can resize the c9.io's windows by dragging their borders.",
         "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>.",
         "You can view this Node School module's source code on GitHub at <a href='https://github.com/azat-co/expressworks'>https://github.com/azat-co/expressworks</a>.",
-        "Complete \"Hello World\"",
+        "Complete \"Hello World!\"",
+        "Complete \"Static\"",
         "Complete \"Jade\"",
         "Complete \"Good Old Form\"",
         "Complete \"Stylish CSS\"",
-        "Complete \"Session and Cookie\"",
+        "Complete \"Param Pam Pam\"",
+        "Complete \"What's In Query\"",
         "Complete \"JSON Me\"",
         "Once you've completed these steps, move on to our next challenge."
       ],

From 1c85bdf8bd325dd9e7b37ad95f0d06c8521b5346 Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Fri, 4 Sep 2015 21:51:34 +0100
Subject: [PATCH 21/54] Tweaked how the modal is focused

---
 client/commonFramework.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/commonFramework.js b/client/commonFramework.js
index 45589df873..3a6c8d911e 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -421,7 +421,8 @@ function showCompletion() {
   );
   var bonfireSolution = myCodeMirror.getValue();
   var didCompleteWith = $('#completed-with').val() || null;
-  $('#complete-courseware-dialog').modal('show').focus();
+  $('#complete-courseware-dialog').modal('show');
+  $('#complete-courseware-dialog .modal-header').click();
   $('#submit-challenge').click(function(e) {
     e.preventDefault();
 

From 04c30473610132c0dc908501418d53983aad1557 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 4 Sep 2015 15:00:58 -0700
Subject: [PATCH 22/54] improve jquery challenge wording

---
 seed/challenges/jquery.json | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index 4df308b372..0ad2a48005 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -310,8 +310,8 @@
       "difficulty": 3.07,
       "description": [
         "In the same way you can add classes to an element with jQuery's <code>addClass()</code> function, you can remove them with jQuery's <code>removeClass()</code> function.",
-        "Let's remove the <code>btn-default</code> class from all of our <code>button</code> elements.",
-        "Here's how you would do this for a specific button, add <code>$(\"#target2\").removeClass(\"btn-default\");</code>"
+        "Here's how you would do this for a specific button, add <code>$(\"#target2\").removeClass(\"btn-default\");</code>",
+        "Let's remove the <code>btn-default</code> class from all of our <code>button</code> elements."
       ],
       "tests": [
         "assert($(\".btn-default\").length === 0, 'Remove the <code>btn-default</code> class from all of your <code>button</code> elements.')",
@@ -360,11 +360,11 @@
       "difficulty": 3.08,
       "description": [
         "We can also change the CSS of an HTML element directly with jQuery.",
-        "Delete your jQuery selectors, leaving an empty <code>document ready function</code>.",
-        "Select <code>target1</code> and change its color to red.",
         "jQuery has a function called <code>.css()</code> that allows you to change the CSS of an element.",
         "Here's how we would change its color to blue: <code>$(\"#target1\").css(\"color\", \"blue\");</code>",
-        "This is slightly different from a normal CSS declaration, because the CSS property and its value are in quotes, and separated with a comma instead of a colon."
+        "This is slightly different from a normal CSS declaration, because the CSS property and its value are in quotes, and separated with a comma instead of a colon.",
+        "Delete your jQuery selectors, leaving an empty <code>document ready function</code>.",
+        "Select <code>target1</code> and change its color to red."
       ],
       "tests": [
         "assert($(\"#target1\").css(\"color\") === 'rgb(255, 0, 0)', 'Your <code>target1</code> element should have red text.')",
@@ -622,9 +622,8 @@
         "Every HTML element has a <code>parent</code> element from which it <code>inherits</code> properties.",
         "For example, your <code>jQuery Playground</code> <code>h3</code> element has the parent element of <code>&#60;div class=\"container-fluid\"&#62</code>, which itself has the parent <code>body</code>.",
         "jQuery has a function called <code>parent()</code> that allows you to access the parent of whichever element you've selected.",
-        "Give the parent of the <code>#target1</code> element background-color of red.",
-        "Here's an example of how you would use the <code>parent()</code> function: <code>$(\"#left-well\").parent().css(\"background-color\", \"blue\")</code>",
-        "Note: Please do not use this example in the challenge; it will target the incorrect element."
+        "Here's an example of how you would use the <code>parent()</code> function if you wanted to give the parent element of the <code>left-well</code> element a background color of blue: <code>$(\"#left-well\").parent().css(\"background-color\", \"blue\")</code>",
+        "Give the parent of the <code>#target1</code> element a background-color of red."
       ],
       "tests": [
         "assert($(\"#left-well\").css(\"background-color\") === 'red' || $(\"#left-well\").css(\"background-color\") === 'rgb(255, 0, 0)' || $(\"#left-well\").css(\"background-color\").toLowerCase() === '#ff0000' || $(\"#left-well\").css(\"background-color\").toLowerCase() === '#f00', 'Your <code>left-well</code> element should have a red background.')",
@@ -678,8 +677,8 @@
         "Many HTML elements have <code>children</code> elements from which they <code>inherit</code> their properties.",
         "For example, every HTML element is a child of your <code>body</code> element, and your \"jQuery Playground\" <code>h3</code> element is a child of your <code>&#60;div class=\"container-fluid\"&#62</code> element.",
         "jQuery has a function called <code>children()</code> that allows you to access the children of whichever element you've selected.",
-        "Give all the children of your <code>#right-well</code> element a color of green.",
-        "Here's an example of how you would use the <code>children()</code> function: <code>$(\"#left-well\").children().css(\"color\", \"blue\")</code>"
+        "Here's an example of how you would use the <code>children()</code> function to give the children of your <code>left-well</code> element the background color of blue: <code>$(\"#left-well\").children().css(\"color\", \"blue\")</code>",
+        "Give all the children of your <code>#right-well</code> element a color of green."
       ],
       "tests": [
         "assert($(\"#target6\").css(\"color\") === 'rgb(0, 128, 0)', 'Your <code>target6</code> element should have green text.')",
@@ -734,8 +733,8 @@
         "You've seen why id attributes are so convenient for targeting with jQuery selectors. But you won't always have such neat ids to work with.",
         "Fortunately, jQuery has some other tricks for targeting the right elements.",
         "jQuery uses CSS Selectors to target elements. <code>target:nth-child(n)</code> css selector allows you to select all the nth element with the target class or element type.",
-        "Make the second child in each of your well elements bounce.",
-        "Here's how you would give the third element in each well bounce: <code>$(\".target:nth-child(3)\").addClass(\"animated bounce\");</code>"
+        "Here's how you would give the third element in each well bounce: <code>$(\".target:nth-child(3)\").addClass(\"animated bounce\");</code>",
+        "Make the second child in each of your well elements bounce."
       ],
       "tests": [
         "assert($(\".target:nth-child(2)\").hasClass(\"animated\") && $(\".target:nth-child(2)\").hasClass(\"bounce\"), 'The second element in each of your <code>well</code> elements should bounce.')",

From c34a64b4545c8dba06cfd6b7dfd34e3d8abb492c Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 4 Sep 2015 15:22:45 -0700
Subject: [PATCH 23/54] fix typeof wording

---
 seed/challenges/automated-testing-and-debugging.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/seed/challenges/automated-testing-and-debugging.json b/seed/challenges/automated-testing-and-debugging.json
index 9cf677a024..2fbb5352d7 100644
--- a/seed/challenges/automated-testing-and-debugging.json
+++ b/seed/challenges/automated-testing-and-debugging.json
@@ -28,9 +28,9 @@
       "title":"Using typeof",
       "difficulty":0,
       "description":[
-        "<code>typeof</code> is a useful method that we can use to check the type of a variable.",
-        "One thing to be careful of is that an array has the type objects.",
-        "Try using each of these to see the types they have.",
+        "You can use <code>typeof</code> to check the <code>data structure</code>, or type, of a variable.",
+        "Note that in JavaScript, arrays are technically a type of object.",
+        "Try using <code>typeof</code> on each of the following to see which types they have.",
         "<code>console.log(typeof(\"\"));</code>",
         "<code>console.log(typeof(0));</code>",
         "<code>console.log(typeof([]));</code>",

From 0075bab84e69b9b86d49840d6a7abeca8115fa0c Mon Sep 17 00:00:00 2001
From: benmcmahon100 <benmcmahon100@gmail.com>
Date: Sat, 5 Sep 2015 01:04:25 +0100
Subject: [PATCH 24/54] Merge #2887

---
 .../json-apis-and-ajax.json                   | 104 ++++++++++--------
 1 file changed, 56 insertions(+), 48 deletions(-)

diff --git a/seed/under-construction/json-apis-and-ajax.json b/seed/under-construction/json-apis-and-ajax.json
index 5a74cb3a61..ab12090b02 100644
--- a/seed/under-construction/json-apis-and-ajax.json
+++ b/seed/under-construction/json-apis-and-ajax.json
@@ -7,6 +7,10 @@
       "title":  "Trigger on click Events with jQuery",
       "difficulty": 3.19,
       "description": [
+        "With jQuery we are able to get data from APIs via Ajax",
+        "This data normally comes in the form of JSON",
+        "Let's get the <code>Get Message</code> button to set the text of a div",
+        "We will later use this to display the result of out API request",
         "<code>$(\"#getMessage\").on(\"click\", function(){</code>",
         "<code>&thinsp;&thinsp;$(\".message\").html(\"Here is the message\");</code>",
         "<code>});</code>"
@@ -48,10 +52,60 @@
       "challengeType": 0,
       "type": "waypoint"
     },
-
+    {
+      "id": "bad87fee1348bd9aebc08726",
+      "title": "Learn JSON Syntax",
+      "description": [
+        "JSON stands for \"JavaScript Object Notation\". It\"s how you create objects in JavaScript.",
+        "JSON is a series of \"key-value pairs\". Everything on the left of the colon (<code>:</code>) is the \"key\" you use to unlock the \"value\" on the right of the colon."
+      ],
+      "tests": [
+        "assert(typeof data != \"undefined\", \"Whoops! It looks like you deleted the <code>data</code> variable!\");",
+        "assert(typeof getAnId != \"undefined\", \"Whoops! It looks like you deleted the <code>getAnId</code> function!\");",
+        "assert(data[0]['id'] === getAnId(), \"The duntion getFirstId should return the id of the first element in the array\");"
+      ],
+      "challengeSeed": [
+        "fccss",
+        "var data = [",
+        "  {",
+        "    \"id\": 0,",
+        "    \"imageLink\": \"http://rs611.pbsrc.com/albums/tt194/allypopper423/Funny-Cat-Green-Avacado.jpg~c200\",",
+        "    \"codeNames\": [",
+        "      \"Juggernaut\",",
+        "      \"Mrs. Wallace\",",
+        "      \"Buttercup\"",
+        "    ]",
+        "  },",
+        "  {",
+        "    \"id\": 1,",
+        "    \"imageLink\": \"http://cdn.grumpycats.com/wp-content/uploads/2012/09/GC-Gravatar-copy.png\",",
+        "    \"codeNames\": [",
+        "      \"Oscar\",",
+        "      \"Scrooge\",",
+        "      \"Tyrion\"",
+        "    ]",
+        "  },",
+        "  {",
+        "    \"id\": 2,",
+        "    \"imageLink\": \"http://www.kittenspet.com/wp-content/uploads/2012/08/cat_with_funny_face_3-200x200.jpg\",",
+        "    \"codeNames\": [",
+        "      \"The Doctor\",",
+        "      \"Loki\",",
+        "      \"Joker\"",
+        "    ]",
+        "  }",
+        "]",
+        "function getAnId(){",
+        "  return();",
+        "}",
+        "fcces"
+      ],
+      "challengeType": 0,
+      "type": "waypoint"
+    },
     {
       "id": "bad87fee1348bd9aeca08826",
-      "title":  "Learn how JSON works",
+      "title":  "Displaying JSON data in HTML",
       "difficulty": 3.19,
       "description": [
         "JSON stands for \"JavaScript Object Notation\". It\"s how you create objects in JavaScript.",
@@ -272,52 +326,6 @@
       "type": "waypoint"
     },
 
-
-    {
-      "id": "bad87fee1348bd9aebc08726",
-      "title": "Learn how JSON Works",
-      "description": [
-        "JSON stands for \"JavaScript Object Notation\". It\"s how you create objects in JavaScript.",
-        "JSON is a series of \"key-value pairs\". Everything on the left of the colon (<code>:</code>) is the \"key\" you use to unlock the \"value\" on the right of the colon."
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "[",
-        "  {",
-        "    \"id\": 0,",
-        "    \"imageLink\": \"http://rs611.pbsrc.com/albums/tt194/allypopper423/Funny-Cat-Green-Avacado.jpg~c200\",",
-        "    \"codeNames\": [",
-        "      \"Juggernaut\",",
-        "      \"Mrs. Wallace\",",
-        "      \"Buttercup\"",
-        "    ]",
-        "  },",
-        "  {",
-        "    \"id\": 1,",
-        "    \"imageLink\": \"http://cdn.grumpycats.com/wp-content/uploads/2012/09/GC-Gravatar-copy.png\",",
-        "    \"codeNames\": [",
-        "      \"Oscar\",",
-        "      \"Scrooge\",",
-        "      \"Tyrion\"",
-        "    ]",
-        "  },",
-        "  {",
-        "    \"id\": 2,",
-        "    \"imageLink\": \"http://www.kittenspet.com/wp-content/uploads/2012/08/cat_with_funny_face_3-200x200.jpg\",",
-        "    \"codeNames\": [",
-        "      \"The Doctor\",",
-        "      \"Loki\",",
-        "      \"Joker\"",
-        "    ]",
-        "  }",
-        "]"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
     {
       "id": "bad87fee1348bd9aebc08826",
       "title": "Get Data from an URL Using jQuery",

From 7289607f07dc232426faf38f0df25883751c700c Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Sat, 5 Sep 2015 16:38:09 +0400
Subject: [PATCH 25/54] Fixes 'd[0].toLowerCase() is not a function' error

---
 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 7c5df36b40..fd7636b2e6 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -638,7 +638,7 @@
         "Let's take the code we had last time and <code>unshift</code>this value to the start: <code>\"Paul\" </code>"
       ],
       "tests": [
-        "assert((function(d){if(d[0].toLowerCase() == 'paul' && d[1] == 23 && d[2][0] != undefined && d[2][0] == 'dog' && d[2][1] != undefined && d[2][1] == 3){return true;}else{return false;}})(myArray), 'myArray should now have [\"Paul\", 23, [\"dog\", 3]])');"
+        "assert((function(d){if(typeof(d[0]) === \"string\" && d[0].toLowerCase() == 'paul' && d[1] == 23 && d[2][0] != undefined && d[2][0] == 'dog' && d[2][1] != undefined && d[2][1] == 3){return true;}else{return false;}})(myArray), '<code>myArray</code> should now have [\"Paul\", 23, [\"dog\", 3]]).');"
       ],
       "challengeSeed": [
         "var ourArray = [\"Stimpson\", \"J\", [\"cat\"]];",

From f4512dd92917acff5ae22dccaa1435b42898466e Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Sat, 5 Sep 2015 18:05:09 +0400
Subject: [PATCH 26/54] fixes assert and some text

---
 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 7c5df36b40..567f58923d 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -283,7 +283,7 @@
         "Replace the <code>0</code> with the correct number so you can get the result mentioned in the comment."
       ],
       "tests": [
-        "assert((function(){if(sum === 20 && editor.getValue().match(/\\+/g)){return true;}else{return false;}})(), 'Make the variable <code>sum</code> equal 20');"
+        "assert((function(){if(sum === 20 && editor.getValue().match(/\\+/g).length >= 2){return true;}else{return false;}})(), 'Make the variable <code>sum</code> equal 20.');"
       ],
       "challengeSeed": [
         "var sum = 10 + 0; //make this equal to 20 by changing the 0 into the appropriate number.",

From f417adc2d1c37b09f30fe6e2d135e2d15d460d22 Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Sat, 5 Sep 2015 19:20:41 +0400
Subject: [PATCH 27/54] fixes a condition in assert

---
 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 7c5df36b40..efdc7610c7 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -352,7 +352,7 @@
         "Replace the <code>0</code> with the correct number so you can get the result mentioned in the comment."
       ],
       "tests": [
-        "assert((function(){if(quotient === 2 && editor.getValue().match(/\\//g)){return true;}else{return false;}})(), 'Make the variable <code>quotient</code> equal 2.');"
+        "assert((function(){if(quotient === 2 && editor.getValue().match(/var\\s*?quotient\\s*?\\=\\s*?\\d+\\s*?\\/\\s*?\\d+\\s*?;/g)){return true;}else{return false;}})(), 'Make the variable <code>quotient</code> equal 2.');"
       ],
       "challengeSeed": [
         "var quotient = 66 / 0; //make this equal to 2 by changing the 0 into the appropriate number.",

From a4650adda0fc584c7553620bafc5811ba3834445 Mon Sep 17 00:00:00 2001
From: elitepc <pedrocaseiro7@gmail.com>
Date: Sat, 5 Sep 2015 20:59:46 +0100
Subject: [PATCH 28/54] added missing verb in the get set for basejumps

---
 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 c5d3e871c5..bf872054bf 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -54,7 +54,7 @@
         "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>.",
-        "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 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\".",
+        "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."

From aa34bf1a41d77ea00e967336a42b39757105fe0f Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sat, 5 Sep 2015 20:53:54 -0400
Subject: [PATCH 29/54] Added details to instructions of JS arrays waypoint;
 closes #2136

---
 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 7c5df36b40..69f2f02254 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -422,7 +422,7 @@
       "description": [
         "With JavaScript <code>array</code> variables, we can store several pieces of data in one place.",
         "You start an array declaration with an opening bracket, end it with a closing bracket, and put a comma between each entry, like this: <code>var sandwich = [\"peanut butter\", \"jelly\", \"bread\"]</code>.",
-        "Now let's create a new array called <code>myArray</code> that contains both a <code>string</code> and a <code>number</code>.",
+        "Now let's create a new array called <code>myArray</code> that contains both a <code>string</code> and a <code>number</code> (in that order).",
         "Refer to the comments if you get stuck."
       ],
       "tests": [

From 1151929f25c0c7e8d27bdfda18e00fc9224e9182 Mon Sep 17 00:00:00 2001
From: natac13 <sean.campbell13@gmail.com>
Date: Sat, 5 Sep 2015 21:39:27 -0400
Subject: [PATCH 30/54] General improvements to jquery file

added a few tests to account for single and double quotes
fixed a typo
added test to add clarity

closes #3107
---
 seed/challenges/jquery.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index 0ad2a48005..358ad754d8 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -263,9 +263,9 @@
         "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>."
       ],
       "tests": [
-        "assert(editor.match(/\\$\\(.*button/g), 'Use the <code>$&#40\"button\"&#41</code> selector.')",
-        "assert(editor.match(/\\$\\(.*\\.btn/g), 'Use the <code>$&#40\".btn\"&#41</code> selector.')",
-        "assert(editor.match(/\\$\\(.*#target1/g), 'Use the <code>$&#40\"#target1\"&#41</code> selector.')",
+        "assert((editor.match(/\\$\\(\\'button\\'/g) || editor.match(/\\$\\(\"button\"/g)), 'Use the <code>$&#40\"button\"&#41</code> selector.')",
+        "assert((editor.match(/\\$\\(\\'\\.btn\\'/g) || editor.match(/\\$\\(\"\\.btn\"/g)), 'Use the <code>$&#40\".btn\"&#41</code> selector.')",
+        "assert((editor.match(/\\$\\(\\'#target1\\'/g) || editor.match(/\\$\\(\"#target1\"/g)), 'Use the <code>$&#40\"#target1\"&#41</code> selector.')",
         "assert(editor.match(/addClass/g) && editor.match(/addClass/g).length > 2, 'Only add one class with each of your three selectors.')",
         "assert($(\"#target1\").hasClass(\"animated\") && $(\"#target1\").hasClass(\"shake\") && $(\"#target1\").hasClass(\"btn-primary\"), 'Your <code>#target1</code> element should have the classes <code>animated</code>&#130; <code>shake</code> and <code>btn-primary</code>.')",
         "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
@@ -627,7 +627,8 @@
       ],
       "tests": [
         "assert($(\"#left-well\").css(\"background-color\") === 'red' || $(\"#left-well\").css(\"background-color\") === 'rgb(255, 0, 0)' || $(\"#left-well\").css(\"background-color\").toLowerCase() === '#ff0000' || $(\"#left-well\").css(\"background-color\").toLowerCase() === '#f00', 'Your <code>left-well</code> element should have a red background.')",
-        "assert(editor.match(/\\.parent\\(\\)\\.css/g), 'You should use the <code>parent()</code> function to modify this element.')",
+        "assert(editor.match(/\\.parent\\(\\)\\.css/g), 'You should use the <code>&#46;parent&#40;&#41;</code> function to modify this element.')",
+        "assert((editor.match(/\\$\\(\\'#target1\\'\\)\\.parent/g) || editor.match(/\\$\\(\"#target1\"\\)\\.parent/g)), 'The <code>&#46;parent&#40;&#41;</code> method should be called on the <code>&#35;target1</code> element.')",
         "assert(editor.match(/<div class=\"well\" id=\"left-well\">/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [

From 2817ec49a9ff912486491de434c61e4e18b2718b Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sun, 6 Sep 2015 00:37:12 -0400
Subject: [PATCH 31/54] Checks that length is used twice for JS bracket
 notation challenges; closes #3105

---
 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 7c5df36b40..5a667337fb 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -221,7 +221,7 @@
       ],
       "tests": [
         "assert(lastLetterOfLastName === \"e\", 'lastLetterOfLastName should be \"e\"');",
-        "assert(editor.getValue().match(/\\.length/g), 'You have to use <code>.length</code> to get the last letter');"
+        "assert(editor.getValue().match(/\\.length/g).length === 2, 'You have to use <code>.length</code> to get the last letter');"
       ],
       "challengeSeed": [
         "var firstName = \"Ada\";",
@@ -253,7 +253,7 @@
       ],
       "tests": [
         "assert(secondToLastLetterOfLastName === 'c', 'secondToLastLetterOfLastName should be \"c\".');",
-        "assert(editor.getValue().match(/\\.length/g), 'You have to use .length to get the third last letter.');"
+        "assert(editor.getValue().match(/\\.length/g).length == 2, 'You have to use .length to get the third last letter.');"
       ],
       "challengeSeed": [
         "var firstName = \"Ada\";",

From 0f46ed8c9d3c7e0dbbacea810a6d4eef2ee420ad Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sun, 6 Sep 2015 00:39:07 -0400
Subject: [PATCH 32/54] Used strict equality for second assert

---
 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 5a667337fb..d06a1038a9 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -253,7 +253,7 @@
       ],
       "tests": [
         "assert(secondToLastLetterOfLastName === 'c', 'secondToLastLetterOfLastName should be \"c\".');",
-        "assert(editor.getValue().match(/\\.length/g).length == 2, 'You have to use .length to get the third last letter.');"
+        "assert(editor.getValue().match(/\\.length/g).length === 2, 'You have to use .length to get the third last letter.');"
       ],
       "challengeSeed": [
         "var firstName = \"Ada\";",

From 46a83b42a1ea5646af2b3300bb353da8350feadb Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Sun, 6 Sep 2015 11:40:06 +0400
Subject: [PATCH 33/54] removes the checkbox at all

---
 client/main.js                              | 6 ++----
 server/views/partials/challenge-modals.jade | 5 -----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/client/main.js b/client/main.js
index a74e8d1c94..30110eb97e 100644
--- a/client/main.js
+++ b/client/main.js
@@ -76,10 +76,8 @@ $(document).ready(function() {
       $('#report-issue').unbind('click');
       $('#report-issue').on('click', function() {
           var textMessage = 'https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge ' + window.location.href + ' has an issue. Please describe how to reproduce it, and include links to screenshots if possible.';
-          if($('#user-agent-checkbox').is(':checked')) {
-            textMessage += ' My User Agent is: <code>' + navigator.userAgent + '</code>';
-            textMessage = textMessage.replace(';', ','); //GitHub cuts User Agent text because of ';' symbol so I just replace it with ','
-          }
+          textMessage += ' My User Agent is: <code>' + navigator.userAgent + '</code>.';
+          textMessage = textMessage.replace(';', ','); //GitHub cuts User Agent text because of ';' symbol so I just replace it with ','
           $('#issue-modal').modal('hide');
           window.open(textMessage, '_blank');
       });
diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade
index 43a102f704..b703581a3c 100644
--- a/server/views/partials/challenge-modals.jade
+++ b/server/views/partials/challenge-modals.jade
@@ -20,11 +20,6 @@
             .modal-body.text-center
                 h3 This will open our GitHub Issues page.
                 h3 Please tell us how to reproduce the bug and link us to screenshots if possible.
-                h4.row
-                    .col-xs-1.col-sm-1.col-md-1
-                        input#user-agent-checkbox(type='checkbox', checked) 
-                    .col-xs-11.col-sm-11.col-md-11
-                        label.text-warning.bg-info(for='user-agent-checkbox' style='cursor:pointer;') Include your OS and Browser version in the text of issue to provide more detailed information
                 h3 It's recommended first to search issues in GitHub. It could be a similar issue opened or already solved!
                 h3 
                     | Also take a look at this helpful Wiki article: 

From 73ef8b9d2bfed5fa340bbc53385dbab626abdd7c Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 6 Sep 2015 03:12:59 -0700
Subject: [PATCH 34/54] fix a view bug

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

diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade
index 6bd38d9737..df46b026e0 100644
--- a/server/views/coursewares/showZiplineOrBasejump.jade
+++ b/server/views/coursewares/showZiplineOrBasejump.jade
@@ -74,7 +74,7 @@ block content
                                 .col-xs-10.col-xs-offset-1.col-sm-8.col-sm-offset-2.col-md-8.col-md-offset-2.animated.fadeIn
                                     // extra field to distract password tools like lastpass from injecting css into our username field
                                     input.form-control(ng-show="false")
-                                    if (challengeType === 3)
+                                    if (challengeType === "3")
                                         input.form-control#public-url(type='url', name="solutionUrl", placeholder="http://codepen.io/your-pen-here", autofocus, required, ng-minlength="10", ng-model="deploymentUrl")
                                     else
                                         input.form-control#public-url(type='url', name="solutionUrl", placeholder="http://yourapp.com", autofocus, required, ng-minlength="10", ng-model="deploymentUrl")

From 227b57492713e3a07ec2b38f34b5de86e8d843bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADnez?= <jbm.public@yahoo.com>
Date: Sun, 6 Sep 2015 15:08:14 +0000
Subject: [PATCH 35/54] removed semicolons at the end of asserts

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

diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index cd059066b1..515a12ea28 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -160,8 +160,8 @@
         "Here's how you'd make the <code>button</code> element with the id <code>target6</code> fade out: <code>$(\"#target6\").addClass(\"animated fadeOut\")</code>."
       ],
       "tests": [
-        "assert($(\"#target3\").hasClass(\"animated\"), 'Select the <code>button</code>element with the <code>id</code> of <code>target3</code> and use the jQuery <code>addClass&#40&#41</code> function to give it the class of <code>animated</code>.');",
-        "assert(($(\"#target3\").hasClass(\"fadeOut\") || $(\"#target3\").hasClass(\"fadeout\"))  && editor.match(/\\$\\(.#target3.\\)/g), 'Target the element with the id <code>target3</code> and use the jQuery <code>addClass&#40&#41</code> function to give it the class <code>fadeOut</code>.');",
+        "assert($(\"#target3\").hasClass(\"animated\"), 'Select the <code>button</code>element with the <code>id</code> of <code>target3</code> and use the jQuery <code>addClass&#40&#41</code> function to give it the class of <code>animated</code>.')",
+        "assert(($(\"#target3\").hasClass(\"fadeOut\") || $(\"#target3\").hasClass(\"fadeout\"))  && editor.match(/\\$\\(.#target3.\\)/g), 'Target the element with the id <code>target3</code> and use the jQuery <code>addClass&#40&#41</code> function to give it the class <code>fadeOut</code>.')",
         "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [

From c28ddf5875412e61167e087ee64934375ebc651c Mon Sep 17 00:00:00 2001
From: Timothy Cyrus <tcyrus@users.noreply.github.com>
Date: Sun, 6 Sep 2015 15:14:28 -0400
Subject: [PATCH 36/54] Update README.md

Added missing code blocks in README and replaced the HTML image at the top to use the Markdown equivalent.
---
 README.md | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index dba5013540..e9ab6393c6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<img src="https://s3.amazonaws.com/freecodecamp/wide-social-banner.png">
+![](https://s3.amazonaws.com/freecodecamp/wide-social-banner.png)
 
 [![Throughput Graph](https://graphs.waffle.io/freecodecamp/freecodecamp/throughput.svg)](https://waffle.io/freecodecamp/freecodecamp/metrics)
 
@@ -35,8 +35,8 @@ We welcome pull requests from Free Code Camp campers (our students) and seasoned
 2.  Pick an issue that nobody has claimed and start working on it. If your issue isn't on the board, open an issue. If you think you can fix it yourself, start working on it. Feel free to ask for help in our [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp).
 3.  Fork the project ([Need help with forking a project?](https://help.github.com/articles/fork-a-repo/)). You'll do all of your work on your forked copy.
 4.  Create a branch specific to the issue or feature you are working on. Push your work to that branch. ([Need help with branching?](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches))
-5.  Name the branch something like  `user-xxx` where user is your username and xxx is the issue number you are addressing.
-6.  You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [AirBnB's JavaScript Style Guide](https://github.com/airbnb/javascript).  Please do not ignore any linting errors, as they are meant to **help** you. Make sure none of your JavaScript is longer than 80 characters per line.
+5.  Name the branch something like `user-xxx` where `user` is your username and `xxx` is the issue number you are addressing.
+6.  You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [AirBnB's JavaScript Style Guide](https://github.com/airbnb/javascript). Please do not ignore any linting errors, as they are meant to **help** you. Make sure none of your JavaScript is longer than 80 characters per line.
 7.  Once your code is ready, submit a pull request from your branch to Free Code Camp's `staging` branch. We'll do a quick code review and give you feedback, then iterate from there.
 8.  Once we accept one of your pull requests, one of the project owners (currently @quincylarson, @terakilobyte, and @berkeleytrue) will add you to our camper contributor group.
 
@@ -70,10 +70,9 @@ touch .env
 npm install -g gulp
 ```
 
-Edit your .env file with the following API keys accordingly (if you only use email login, only the MONGOHQ_URL, SESSION_SECRET, MANDRILL_USER and MANDRILL_PASSWORD fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services.
+Edit your `.env` file with the following API keys accordingly (if you only use email login, only the `MONGOHQ_URL`, `SESSION_SECRET`, `MANDRILL_USER` and `MANDRILL_PASSWORD` fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services.
 
 ```
-
 MONGOHQ_URL='mongodb://localhost:27017/freecodecamp'
 
 FACEBOOK_ID=stuff
@@ -106,11 +105,9 @@ COOKIE_SECRET='this is a secret'
 
 PEER=stuff
 DEBUG=true
-
 ```
 
 ```bash
-
 # Start the mongo server
 mongod
 
@@ -124,7 +121,6 @@ node seed/
 
 # start the application
 gulp
-
 ```
 
 License

From 033175ae230b04889f16e15130cdb5e36b8247d5 Mon Sep 17 00:00:00 2001
From: Jakob Dahl <jakobdahl@gmail.com>
Date: Mon, 7 Sep 2015 03:08:08 +0200
Subject: [PATCH 37/54] Updated and rebased pr

---
 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 da1c55830e..42b9c90e8e 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -253,7 +253,7 @@
       ],
       "tests": [
         "assert(secondToLastLetterOfLastName === 'c', 'secondToLastLetterOfLastName should be \"c\".');",
-        "assert(editor.getValue().match(/\\.length/g).length === 2, 'You have to use .length to get the third last letter.');"
+        "assert(editor.getValue().match(/\\.length/g).length === 2, 'You have to use .length to get the second last letter.');"
       ],
       "challengeSeed": [
         "var firstName = \"Ada\";",

From c2468b4946afa968b03509cb606fe59ae1a175eb Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Mon, 7 Sep 2015 07:54:29 -0700
Subject: [PATCH 38/54] Tweak @bugron's improvements to our issue submission
 process

---
 client/main.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/main.js b/client/main.js
index 30110eb97e..8dcc2a19db 100644
--- a/client/main.js
+++ b/client/main.js
@@ -69,14 +69,14 @@ $(document).ready(function() {
       $('#search-issue').unbind('click');
       $('#search-issue').on('click', function() {
           var queryIssue = window.location.href.toString();
-          $('#issue-modal').modal('hide');
           window.open('https://github.com/FreeCodeCamp/FreeCodeCamp/issues?q=is:issue is:all '+ queryIssue.substr(queryIssue.lastIndexOf('challenges/') + 11).replace('/', ''), '_blank');
       });
 
       $('#report-issue').unbind('click');
       $('#report-issue').on('click', function() {
-          var textMessage = 'https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge ' + window.location.href + ' has an issue. Please describe how to reproduce it, and include links to screenshots if possible.';
-          textMessage += ' My User Agent is: <code>' + navigator.userAgent + '</code>.';
+          var textMessage = 'https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge ' + window.location.href + ' has an issue.';
+          textMessage += ' User Agent is: <code>' + navigator.userAgent + '</code>.';
+          textMessage += ' Please describe how to reproduce this issue, and include links to screenshots if possible.%0A%0A';
           textMessage = textMessage.replace(';', ','); //GitHub cuts User Agent text because of ';' symbol so I just replace it with ','
           $('#issue-modal').modal('hide');
           window.open(textMessage, '_blank');

From 5502aba81728cbf9df9e8bd5f086deeb14d44e7b Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Mon, 7 Sep 2015 08:18:44 -0700
Subject: [PATCH 39/54] further revisions to simplify bug modal

---
 client/main.js                              |  6 ++++++
 server/views/partials/challenge-modals.jade | 11 +++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/main.js b/client/main.js
index 8dcc2a19db..bbd69857d0 100644
--- a/client/main.js
+++ b/client/main.js
@@ -72,6 +72,12 @@ $(document).ready(function() {
           window.open('https://github.com/FreeCodeCamp/FreeCodeCamp/issues?q=is:issue is:all '+ queryIssue.substr(queryIssue.lastIndexOf('challenges/') + 11).replace('/', ''), '_blank');
       });
 
+      $('#help-ive-found-a-bug-wiki-article').unbind('click');
+      $('#help-ive-found-a-bug-wiki-article').on('click', function() {
+        var queryIssue = window.location.href.toString();
+        window.open("https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I've-Found-a-Bug", '_blank');
+      });
+
       $('#report-issue').unbind('click');
       $('#report-issue').on('click', function() {
           var textMessage = 'https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge ' + window.location.href + ' has an issue.';
diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade
index b703581a3c..cd0339cc08 100644
--- a/server/views/partials/challenge-modals.jade
+++ b/server/views/partials/challenge-modals.jade
@@ -18,14 +18,9 @@
             .modal-header.challenge-list-header Did you find a bug?
                 a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
             .modal-body.text-center
-                h3 This will open our GitHub Issues page.
-                h3 Please tell us how to reproduce the bug and link us to screenshots if possible.
-                h3 It's recommended first to search issues in GitHub. It could be a similar issue opened or already solved!
-                h3 
-                    | Also take a look at this helpful Wiki article: 
-                    br
-                    a(href='https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I%27ve-Found-a-Bug', target='_blank') Help I've Found a Bug
-                a.btn.btn-lg.btn-success.btn-block#search-issue(name='_csrf', value=_csrf) Search issues on this challenge in GitHub
+                h3 Before you submit a new issue, read "Help I've Found a Bug" and browse other issues with this challenge.
+                a.btn.btn-lg.btn-success.btn-block#help-ive-found-a-bug-wiki-article(name='_csrf', value=_csrf) Read "Help I've Found a Bug"
+                a.btn.btn-lg.btn-success.btn-block#search-issue(name='_csrf', value=_csrf) Browse other issues with this challenge
                 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
 

From 3361599d3a318b5eb8564bb5f45581d13ce744e5 Mon Sep 17 00:00:00 2001
From: natac13 <sean.campbell13@gmail.com>
Date: Mon, 7 Sep 2015 13:09:51 -0400
Subject: [PATCH 40/54] fix mispelling of falsey to falsy

closes #3149
---
 seed/challenges/basic-bonfires.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index d0bd24aa1c..207cda2843 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -531,11 +531,11 @@
     },
     {
       "id": "adf08ec01beb4f99fc7a68f2",
-      "title": "Falsey Bouncer",
+      "title": "Falsy Bouncer",
       "difficulty": "1.50",
       "description": [
-        "Remove all falsey values from an array.",
-        "Falsey values in javascript are false, null, 0, \"\", undefined, and NaN.",
+        "Remove all falsy values from an array.",
+        "Falsy values in javascript are false, null, 0, \"\", undefined, and NaN.",
         "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": [
@@ -547,9 +547,9 @@
         "bouncer([7, 'ate', '', false, 9]);"
       ],
       "tests": [
-        "assert.deepEqual(bouncer([7, 'ate', '', false, 9]), [7, 'ate', 9], 'should remove falsey values');",
-        "assert.deepEqual(bouncer(['a', 'b', 'c']), ['a', 'b', 'c'], 'should return full array if no falsey elements');",
-        "assert.deepEqual(bouncer([false, null, 0]), [], 'should return empty array if all elements are falsey');"
+        "assert.deepEqual(bouncer([7, 'ate', '', false, 9]), [7, 'ate', 9], 'should remove falsy values');",
+        "assert.deepEqual(bouncer(['a', 'b', 'c']), ['a', 'b', 'c'], 'should return full array if no falsy elements');",
+        "assert.deepEqual(bouncer([false, null, 0]), [], 'should return empty array if all elements are falsy');"
       ],
       "MDNlinks": [
         "Boolean Objects",

From 0055c3b27121d685057fb92514d3719a1e2461ec Mon Sep 17 00:00:00 2001
From: ahstro <anton@lutic.org>
Date: Mon, 7 Sep 2015 22:54:32 +0200
Subject: [PATCH 41/54] Move brace out of user-edit scope

Move the closing brace of a function down below the
`// Only change code above this line`-comment in
`Use Conditional Logic with IfElse Statements`

Fix #3152
---
 seed/challenges/basic-javascript.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index da1c55830e..9ff2402564 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -986,9 +986,10 @@
         "  // Only change code below this line.",
         "",
         "",
+        "",
+        "  // Only change code above this line.",
         "}",
         "",
-        "// Only change code above this line.",
         "// We use this function to show you the value of your variable in your output box.",
         "(function(){return myFunction();})();"
       ],

From 080ef01f3339c251d9c2f2d2ae757558dc49a73b Mon Sep 17 00:00:00 2001
From: Timothy Cyrus <tcyrus@users.noreply.github.com>
Date: Mon, 7 Sep 2015 17:46:49 -0400
Subject: [PATCH 42/54] Update basic-bonfires.json

Remove repeated "the" in Instructions for "Where art thou"

Changed "the the" to "the"
---
 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 d0bd24aa1c..e5c2a467d5 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -574,7 +574,7 @@
       "difficulty": "1.55",
       "description": [
         "Make a function that looks through an array of objects (first argument) and returns an array of all objects that have matching property and value pairs (second argument). Each property and value pair of the source object has to be present in the object from the collection if it is to be included in the returned array.",
-        "For example, if the first argument is <code>[{ first: 'Romeo', last: 'Montague' }, { first: 'Mercutio', last: null }, { first: 'Tybalt', last: 'Capulet' }]</code>, and the second argument is <code>{ last: 'Capulet' }</code>, then you must return the the third object from the array (the first argument), because it contains the property and it's value, that was passed on as the second argument.",
+        "For example, if the first argument is <code>[{ first: 'Romeo', last: 'Montague' }, { first: 'Mercutio', last: null }, { first: 'Tybalt', last: 'Capulet' }]</code>, and the second argument is <code>{ last: 'Capulet' }</code>, then you must return the third object from the array (the first argument), because it contains the property and it's value, that was passed on as the second argument.",
         "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": [

From 796abfc99e6a83041d2f57cec75efd34f8b9ff6a Mon Sep 17 00:00:00 2001
From: Aniruddh Agarwal <aaniruddh99@gmail.com>
Date: Mon, 7 Sep 2015 06:02:49 +0800
Subject: [PATCH 43/54] Fixed incorrect challenge seed for bootstrap waypoint

Waypoint 'Use Spans for Inline Elements' has incorrect code in the seed. Corrected it.
Closes #3089
---
 seed/challenges/bootstrap.json | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index 4fb06d5ae5..196ecb08c4 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -909,19 +909,11 @@
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",
         "<style>",
-        "  .red-text {",
-        "    color: red;",
-        "  }",
         "",
         "  h2 {",
         "    font-family: Lobster, Monospace;",
         "  }",
         "",
-        "  p {",
-        "    font-size: 16px;",
-        "    font-family: Monospace;",
-        "  }",
-        "",
         "  .thick-green-border {",
         "    border-color: green;",
         "    border-width: 10px;",
@@ -929,17 +921,12 @@
         "    border-radius: 50%;",
         "  }",
         "",
-        "  .smaller-image {",
-        "    width: 100px;",
-        "  }",
         "</style>",
         "",
         "<div class=\"container-fluid\">",
-        "  <h2 class=\"red-text text-center\">CatPhotoApp</h2>",
+        "  <h2 class=\"text-primary text-center\">CatPhotoApp</h2>",
         "",
-        "  <p>Click here for <a href=\"#\">cat photos</a>.</p>",
-        "",
-        "  <a href=\"#\"><img class=\"smaller-image thick-green-border\" src=\"https://bit.ly/fcc-relaxing-cat\"></a>",
+        "  <a href=\"#\"><img class=\"img-responsive thick-green-border\" src=\"https://bit.ly/fcc-relaxing-cat\"></a>",
         "",
         "  <img src=\"http://bit.ly/fcc-running-cats\" class=\"img-responsive\">",
         "  <div class=\"row\">",

From ccb88cadf35f7b9b174c05b9fe2dd4928752c758 Mon Sep 17 00:00:00 2001
From: Dmytro Yarmak <dmytroy@backbase.com>
Date: Tue, 8 Sep 2015 10:58:50 +0300
Subject: [PATCH 44/54] Add output block to "Iterate with JavaScript While
 Loops" challange

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

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 11c6b67e72..f273197e75 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -859,8 +859,14 @@
       ],
       "challengeSeed":[
         "var myArray = [];",
-        "//Push the numbers zero through four to myArray",
+        "// Only change code below this line.",
         "",
+        "// Push the numbers zero through four to myArray using a \"while loop\".",
+        "",
+        "// Only change code above this line.",
+        "// We use this function to show you the value of your variable in your output box.",
+        "// You'll learn about functions soon.",
+        "if(typeof(myArray) !== \"undefined\"){(function(){return myArray;})();}",
         ""
       ],
       "type": "waypoint",

From 721ea81593e840607bbd8f02f14d18b3777687e9 Mon Sep 17 00:00:00 2001
From: Abhisek Pattnaik <abhisekp@engineer.com>
Date: Tue, 8 Sep 2015 16:06:44 +0530
Subject: [PATCH 45/54] Add more falsy values

---
 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 66ecefde0b..250e4a9a2a 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -549,7 +549,7 @@
       "tests": [
         "assert.deepEqual(bouncer([7, 'ate', '', false, 9]), [7, 'ate', 9], 'should remove falsy values');",
         "assert.deepEqual(bouncer(['a', 'b', 'c']), ['a', 'b', 'c'], 'should return full array if no falsy elements');",
-        "assert.deepEqual(bouncer([false, null, 0]), [], 'should return empty array if all elements are falsy');"
+        "assert.deepEqual(bouncer([false, null, 0, NaN, undefined, '']), [], 'should return empty array if all elements are falsy');"
       ],
       "MDNlinks": [
         "Boolean Objects",

From 8fd99e3350a8671a611fafdc74197f629f373086 Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Sun, 6 Sep 2015 14:41:55 +0400
Subject: [PATCH 46/54] removes unnecessary class

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

diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index b5e4a72908..64a10cc314 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -49,7 +49,7 @@ block content
                             var userLoggedIn = true;
                     else
                         .button-spacer
-                        a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress
+                        a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress
                             script.
                                 var userLoggedIn = false;
                     .button-spacer

From e0db3181d399007c010e8da85bef1147c0bae66f Mon Sep 17 00:00:00 2001
From: bugron <bugron@mail.ru>
Date: Tue, 8 Sep 2015 17:21:12 +0400
Subject: [PATCH 47/54] fixes an idle test and some text

---
 seed/challenges/basic-javascript.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index da1c55830e..f4c0377b50 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -974,13 +974,14 @@
         "Create an <code>if-else statement</code> to return <code>heads</code> if the flip var is zero, or else return <code>tails</code> if it's not."
       ],
       "tests":[
-        "assert((function(){if(myFunction() === \"heads\" || myFunction() === \"tails\"){return true;}else{return false;}})(), 'myFunction should either return heads or tails');",
-        "assert(editor.getValue().match(/if/g).length >= 3, 'You should have created a new if statement');",
-        "assert(editor.getValue().match(/else/g).length >= 2, 'You should have created a new else statement');"
+        "assert((function(){var result = myFunction();if(result === 'heads' || result === 'tails'){return true;} else {return false;}})(), '<code>myFunction</code> should either return <code>heads</code> or <code>tails</code>.');",
+        "assert((function(){var result = myFunction();if(result === 'heads' && flip === 0 || result === 'tails' && flip !== 0){return true;} else {return false;}})(), '<code>myFunction</code> should return <code>heads</code> when flip equals 0 and <code>tails</code> when flip equals 1.');",
+        "assert(editor.getValue().match(/if/g).length >= 4, 'You should have created a new if statement.');",
+        "assert(editor.getValue().match(/else/g).length >= 2, 'You should have created a new else statement.');"
       ],
       "challengeSeed":[
+        "var flip = Math.floor(Math.random() * (1 - 0 + 1)) + 0;",
         "function myFunction(){",
-        "  var flip = Math.floor(Math.random() * (1 - 0 + 1)) + 0;",
         "  // Create an if-else statement here to return \"heads\" if flip is 0. Otherwise return \"tails\".",
         "",
         "  // Only change code below this line.",
@@ -990,7 +991,7 @@
         "",
         "// Only change code above this line.",
         "// We use this function to show you the value of your variable in your output box.",
-        "(function(){return myFunction();})();"
+        "var result = myFunction();if(typeof(flip) !== \"undefined\" && typeof(flip) === \"number\" && typeof(result) !== \"undefined\" && typeof(result) === \"string\"){(function(y,z){return 'flip = ' + y.toString() + ', text = ' + z;})(flip, result);}"
       ],
       "type": "waypoint",
       "challengeType": 1

From 36acb95a0bd0c3de707ce53511529354a89d2292 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <berkeley@robotie.com>
Date: Tue, 8 Sep 2015 09:18:01 -0700
Subject: [PATCH 48/54] Update contributing to best practices

removes mention of contributors group.
mention git rebase article
change to free code camps style guide over AirBnB's.
---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e9ab6393c6..7590eccafe 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,9 @@ We welcome pull requests from Free Code Camp campers (our students) and seasoned
 2.  Pick an issue that nobody has claimed and start working on it. If your issue isn't on the board, open an issue. If you think you can fix it yourself, start working on it. Feel free to ask for help in our [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp).
 3.  Fork the project ([Need help with forking a project?](https://help.github.com/articles/fork-a-repo/)). You'll do all of your work on your forked copy.
 4.  Create a branch specific to the issue or feature you are working on. Push your work to that branch. ([Need help with branching?](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches))
-5.  Name the branch something like `user-xxx` where `user` is your username and `xxx` is the issue number you are addressing.
-6.  You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [AirBnB's JavaScript Style Guide](https://github.com/airbnb/javascript). Please do not ignore any linting errors, as they are meant to **help** you. Make sure none of your JavaScript is longer than 80 characters per line.
-7.  Once your code is ready, submit a pull request from your branch to Free Code Camp's `staging` branch. We'll do a quick code review and give you feedback, then iterate from there.
-8.  Once we accept one of your pull requests, one of the project owners (currently @quincylarson, @terakilobyte, and @berkeleytrue) will add you to our camper contributor group.
+5.  Name the branch something like `fix/xxx` or `feature/xxx` where `xxx` is a short description of the changes or feature you are attempting to add. For example `fix/email-login` whould be a branch where I fix something specific to email login.
+6.  You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [Free Code Camp's JavaScript Style Guide](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Free-Code-Camp-JavaScript-Style-Guide) (you can find a summory of those rules [here](https://github.com/FreeCodeCamp/FreeCodeCamp/blob/staging/.eslintrc). Please do not ignore any linting errors, as they are meant to **help** you and to ensure a clean and simple code base. Make sure none of your JavaScript is longer than 80 characters per line.
+7.  Once your code is ready, submit a pull request from your branch to Free Code Camp's `staging` branch. We'll do a quick code review and give you feedback, then iterate from there. It may also be helpful to read about git [rebasing](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/git-rebase).
 
 Prerequisites
 -------------

From e7382667268b79895c8b49c5f858d75337bd366e Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <berkeley@robotie.com>
Date: Tue, 8 Sep 2015 09:19:28 -0700
Subject: [PATCH 49/54] Add contributing guidelines from README

---
 CONTRIBUTING.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ba4e245107..9511ab33cc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,2 +1,12 @@
 We're getting a lot of duplicate issues and bug reports that just aren't reporting actual bugs.
 So, before you submit your issue, please read the [Help I've Found a Bug](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Help-I've-Found-a-Bug) wiki page.
+
+We welcome pull requests from Free Code Camp campers (our students) and seasoned JavaScript developers alike! Follow these steps to contribute:
+
+1.  Check our [public Waffle Board](https://waffle.io/freecodecamp/freecodecamp).
+2.  Pick an issue that nobody has claimed and start working on it. If your issue isn't on the board, open an issue. If you think you can fix it yourself, start working on it. Feel free to ask for help in our [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp).
+3.  Fork the project ([Need help with forking a project?](https://help.github.com/articles/fork-a-repo/)). You'll do all of your work on your forked copy.
+4.  Create a branch specific to the issue or feature you are working on. Push your work to that branch. ([Need help with branching?](https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches))
+5.  Name the branch something like `fix/xxx` or `feature/xxx` where `xxx` is a short description of the changes or feature you are attempting to add. For example `fix/email-login` whould be a branch where I fix something specific to email login.
+6.  You should have [ESLint running in your editor](http://eslint.org/docs/user-guide/integrations.html), and it will highlight anything doesn't conform to [Free Code Camp's JavaScript Style Guide](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Free-Code-Camp-JavaScript-Style-Guide) (you can find a summory of those rules [here](https://github.com/FreeCodeCamp/FreeCodeCamp/blob/staging/.eslintrc). Please do not ignore any linting errors, as they are meant to **help** you and to ensure a clean and simple code base. Make sure none of your JavaScript is longer than 80 characters per line.
+7.  Once your code is ready, submit a pull request from your branch to Free Code Camp's `staging` branch. We'll do a quick code review and give you feedback, then iterate from there. It may also be helpful to read about git [rebasing](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/git-rebase).

From d884aaa924e2f38808fcf332525525e8596a2cc8 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <berkeley@robotie.com>
Date: Tue, 8 Sep 2015 13:45:18 -0700
Subject: [PATCH 50/54] remove contributors list from package.json

We now have over a hundred contributors and this should not be listed in the package.json
---
 package.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/package.json b/package.json
index d35a1c4cf9..44833cc65d 100644
--- a/package.json
+++ b/package.json
@@ -14,16 +14,6 @@
     "test": "mocha --compilers js:babel/register"
   },
   "license": "(BSD-3-Clause AND CC-BY-SA-4.0)",
-  "contributors": [
-    {
-      "name": "Quincy Larson",
-      "url": "https://github.com/QuincyLarson"
-    },
-    {
-      "name": "Nathan Leniz",
-      "url": "https://github.com/terakilobyte"
-    }
-  ],
   "dependencies": {
     "accepts": "~1.2.5",
     "async": "~0.9.0",

From b54b2de9abe67f68bef52fac53181fc7217fbc42 Mon Sep 17 00:00:00 2001
From: Aryan Jabbari <aryan.jabbari21@qmail.cuny.edu>
Date: Sat, 5 Sep 2015 20:10:14 -0400
Subject: [PATCH 51/54] Clarifies instructions for shift() challenge; closes
 #1875

---
 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 7c5df36b40..46fd8b5ac3 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -604,7 +604,7 @@
       "difficulty": "9.9817",
       "description": [
         "<code>pop()</code> always removes the last element of an array. What if you want to remove the first? That's where <code>.shift()</code> comes in.",
-        "Take the myArray array and <code>shift()</code> the first value off of it."
+        "Take the myArray array and <code>shift()</code> the first value off of it.  Set <code>myRemoved</code> to the first value of <code>myArray</code> using <code>shift()</code>."
       ],
       "tests": [
         "assert((function(d){if(d[0] == 23 && d[1][0] == 'dog' && d[1][1] == 3 && d[2] == undefined){return true;}else{return false;}})(myArray), 'myArray should only have the last two values left([23, [\"dog\", 3]])');",

From 1c618799b41ee8062da050d4636c29f11e6063f7 Mon Sep 17 00:00:00 2001
From: Aniruddh Agarwal <aaniruddh99@gmail.com>
Date: Wed, 9 Sep 2015 10:02:08 +0800
Subject: [PATCH 52/54] Fixed typo in Basic Javascript Waypoint

Waypoint 'Sift through Text with Regular Expressions' had `...` in its description instead of `.`. Made the required changes.
closes #3169
---
 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 6b77ebac56..69b3a65487 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1022,7 +1022,7 @@
         "<code>g</code> means that we want to search the entire string for this pattern instead of just the first match.",
         "<code>i</code> means that we want to ignore the case (uppercase or lowercase) when searching for the pattern.",
         "<code>Regular expressions</code> are written by surrounding the pattern with a <code>/</code> symbol.",
-        "Let's try selecting all the occurrences of the word <code>and</code> in the string <code>George Boole and Alan Turing went to the shop and got some milk</code>. We can do this by replacing the <code>...</code> part of our regular expression with the current <code>regular expression</code> with the word <code>and</code>."
+        "Let's try selecting all the occurrences of the word <code>and</code> in the string <code>George Boole and Alan Turing went to the shop and got some milk</code>. We can do this by replacing the <code>.</code> part of our regular expression with the current <code>regular expression</code> with the word <code>and</code>."
       ],
       "tests":[
         "assert(test==2, 'Your <code>regular expression</code> should find two occurrences of the word <code>and</code>');",

From 9067154566cdef98253d42b368bd9232105bd47e Mon Sep 17 00:00:00 2001
From: Aniruddh Agarwal <aaniruddh99@gmail.com>
Date: Wed, 9 Sep 2015 11:52:21 +0800
Subject: [PATCH 53/54] Fix typo in basic-javascript waypoint

Waypoint 'Invert Regular Expression Matches with JavaScript' had a semi-colon in the description for the regex example which is not needed.
closes #3148
---
 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 b7c5ea2dc2..b42dcf7db4 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -1109,7 +1109,7 @@
       "title": "Invert Regular Expression Matches with JavaScript",
       "difficulty":"9.987",
       "description":[
-        "Use <code>/\\S/gi;</code> to match everything that isn't a space in the string.",
+        "Use <code>/\\S/gi</code> to match everything that isn't a space in the string.",
         "You can invert any match by using the uppercase version of the selector <code>\\s</code> versus <code>\\S</code> for example."
       ],
       "tests":[

From 471236b8141d5b9658c6f1c8ae21d548e2f7593e Mon Sep 17 00:00:00 2001
From: Aniruddh Agarwal <aaniruddh99@gmail.com>
Date: Wed, 9 Sep 2015 11:44:53 +0800
Subject: [PATCH 54/54] Fixed wording error in HTML/CSS waypoint

Waypoint 'Add Different Padding to Each Side of an Element' had a small wording error: the tests were missing `the`
closes #3130
---
 seed/challenges/html5-and-css.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index 29bb0cae22..f67197acf5 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -2842,10 +2842,10 @@
         "Give the green box a <code>padding</code> of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side."
       ],
       "tests": [
-        "assert($(\".green-box\").css(\"padding-top\") === \"40px\", 'Your <code>green-box</code> class should give the top of elements <code>40px</code> of <code>padding</code>.')",
-        "assert($(\".green-box\").css(\"padding-left\") === \"40px\", 'Your <code>green-box</code> class should give the left of elements <code>40px</code> of <code>padding</code>.')",
-        "assert($(\".green-box\").css(\"padding-right\") === \"20px\", 'Your <code>green-box</code> class should give the right of elements <code>20px</code> of <code>padding</code>.')",
-        "assert($(\".green-box\").css(\"padding-bottom\") === \"20px\", 'Your <code>green-box</code> class should give the bottom of elements <code>20px</code> of <code>padding</code>.')"
+        "assert($(\".green-box\").css(\"padding-top\") === \"40px\", 'Your <code>green-box</code> class should give the top of the elements <code>40px</code> of <code>padding</code>.')",
+        "assert($(\".green-box\").css(\"padding-left\") === \"40px\", 'Your <code>green-box</code> class should give the left of the elements <code>40px</code> of <code>padding</code>.')",
+        "assert($(\".green-box\").css(\"padding-right\") === \"20px\", 'Your <code>green-box</code> class should give the right of the elements <code>20px</code> of <code>padding</code>.')",
+        "assert($(\".green-box\").css(\"padding-bottom\") === \"20px\", 'Your <code>green-box</code> class should give the bottom of the elements <code>20px</code> of <code>padding</code>.')"
       ],
       "challengeSeed": [
         "<style>",