Merge branch 'master' into coderbye

Conflicts:
	seed_data/bonfires.json

seed_data/bonfires.json

@@ -7,11 +7,12 @@
       "Click the button below for further instructions.",
       "Your goal is to fix the failing test.",
       "First, run all the tests by clicking \"Run code\" or by pressing Control + Enter",
-      "The failing test is in red. Fix the code so that all tests pass. Then you can move on to the next Bonfire."
+      "The failing test is in red. Fix the code so that all tests pass. Then you can move on to the next Bonfire.",
+      "Make this function return true no matter what."
     ],
     "tests": [
-      "expect(meetBonfire(\"test\")).to.be.a(\"boolean\");",
-      "expect(meetBonfire(\"test\")).to.be.true;"
+      "expect(meetBonfire()).to.be.a(\"boolean\");",
+      "expect(meetBonfire()).to.be.true;"
     ],
     "challengeSeed": "function meetBonfire(argument) {\n  // Good luck!\n  console.log(\"you can read this function's argument in the developer tools\", argument);\n\n  return false;\n}\n\n\n\nmeetBonfire(\"You can do this!\");"
   },
@@ -208,10 +209,17 @@
     ]
   },
   {
+<<<<<<< HEAD
     "_id": "a39963a4c10bc8b4d4f06d7e",
     "name": "Seek and Destroy",
     "difficulty": "1.60",
     "description": [
+=======
+    "_id":"a39963a4c10bc8b4d4f06d7e",
+    "name":"Seek and Destroy",
+    "difficulty":"1.60",
+    "description":[
+>>>>>>> master
       "Remove all values (last argument(s)) from an array (first argument) and return as a new array."
     ],
     "challengeSeed": "function destroyer(arr) {\n  // Remove all the values\r\n  return arr;\r\n}\n\ndestroyer([1, 2, 3, 1, 2, 3], 2, 3);",