Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

seed/challenges/basic-bonfires.json

@@ -192,7 +192,8 @@
         "expect(findLongestWord('The quick brown fox jumped over the lazy dog')).to.equal(6);",
         "expect(findLongestWord('May the force be with you')).to.equal(5);",
         "expect(findLongestWord('Google do a barrel roll')).to.equal(6);",
-        "expect(findLongestWord('What is the average airspeed velocity of an unladen swallow')).to.equal(8);"
+        "expect(findLongestWord('What is the average airspeed velocity of an unladen swallow')).to.equal(8);",
+        "expect(findLongestWord('What if we try a super-long word such as otorhinolaryngology')).to.equal(19);"
       ],
       "MDNlinks": [
         "String.split()",

seed/challenges/html5-and-css.json

@@ -1258,8 +1258,8 @@
         "Once you've done this, hover over your image with your cursor. Your cursor's normal pointer should become the link clicking pointer. The photo is now a link."
       ],
       "tests": [
+        "assert($('a').children('img').length > 0, 'Nest your <code>img</code> element within an <code>a</code> element.')",
         "assert(new RegExp('#').test($('a').children('img').parent().attr('href')), 'Your <code>a</code> element should be a dead link with a <code>href</code> attribute set to \"#\".')",
-        "assert($('a').children('img').length > 0, 'Nest your image element within an <code>a</code> element.')",
         "assert(editor.match(/<\\/a>/g) && editor.match(/<a/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure each of your <code>a</code> elements has a closing tag.')"
       ],
       "challengeSeed": [
@@ -3400,7 +3400,7 @@
       "title": "Use Hex Code for Specific Colors",
       "difficulty": 1.54,
       "description": [
-        "Did you know there other ways to represent colors in CSS? One of these ways is called hexadecimal code, or \"hex code\" for short.",
+        "Did you know there are other ways to represent colors in CSS? One of these ways is called hexadecimal code, or \"hex code\" for short.",
         "\"Decimal\" means the numbers zero through nine - the numbers that people use in everyday life. \"Hexadecimal\" includes these 10 numbers, plus the letters A, B, C, D, E and F. This means that Hexidecimal has a total of 16 possible values, instead of the 10 possible values that our normal base-10 number system gives us.",
         "With CSS, we use 6 hexidecimal number to represent colors. For example, <code>#000000</code> is the lowest possible value, and it represents the color black.",
         "Replace the word \"black\" in our <code>body</code> element's background-color with its \"hex code\" representation, <code>#000000</code>. "

seed/challenges/jquery-ajax-and-json.json

@@ -57,7 +57,7 @@
         "For example, let's make all of your <code>button</code> elements bounce. Just add this code inside your \"document ready function\": <code>$('button').addClass('animated bounce')</code>."
       ],
       "tests": [
-        "assert($('button').hasClass('animated') && $('button').hasClass('bounce'), 'Use the jQuery <code>addClass()</code> function to give the classes \"animated\" and \"bounce\" to your <code>img</code> element.')",
+        "assert($('button').hasClass('animated') && $('button').hasClass('bounce'), 'Use the jQuery <code>addClass()</code> function to give the classes \"animated\" and \"bounce\" to your <code>button</code> element.')",
         "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [