Merge branch 'interview' into staging

Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
This commit is contained in:
Quincy Larson
2015-06-14 01:02:39 -07:00
parent 9589b6abeb
commit d5b5973326
2 changed files with 320 additions and 57 deletions

View File

@@ -46,9 +46,8 @@
"dashedName": "bonfire-meet-bonfire",
"difficulty": "0",
"description": [
"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",
"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.",
"Make this function return true no matter what."
],