Merge branch 'staging' into converge-bonfires

Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json

seed/challenges/basic-javascript.json

@@ -520,7 +520,7 @@
       "challengeSeed":[
         "var ourArray = [1,2,3];",
         "ourArray[1] = 3;",
-        "// ourArray[1] now equals [1,3,3].",
+        "// ourArray now equals [1,3,3].",
         "var myArray = [1,2,3];",
         "// Only change code below this line.",
         "",
@@ -643,8 +643,9 @@
       "challengeSeed": [
         "var ourArray = [\"Stimpson\", \"J\", [\"cat\"]];",
         "ourArray.shift();",
-        "// ourArray now equals [\"happy\", \"J\", [\"cat\"]]",
+        "// ourArray now equals [\"J\", [\"cat\"]]",
         "ourArray.unshift(\"happy\");",
+        "// ourArray now equals [\"happy\", \"J\", [\"cat\"]]",
         "",
         "var myArray = [\"John\", 23, [\"dog\", 3]];",
         "myArray.shift();",