From 2dd222a441d043c294be05f4af9b477be81d3d4f Mon Sep 17 00:00:00 2001
From: Brett Guillory <kurzweilfreak@gmail.com>
Date: Sat, 13 Jun 2015 20:54:43 -0500
Subject: [PATCH 01/54] Fixed a word

---
 seed_data/challenges/basic-bonfires.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed_data/challenges/basic-bonfires.json b/seed_data/challenges/basic-bonfires.json
index 3773c4da22..67e3ef965e 100644
--- a/seed_data/challenges/basic-bonfires.json
+++ b/seed_data/challenges/basic-bonfires.json
@@ -832,7 +832,7 @@
       "difficulty": "2.03",
       "description": [
         "Perform a search and replace on the sentence using the arguments provided and return the new sentence.",
-        "First argument is the sentence the perform the search and replace on.",
+        "First argument is the sentence to perform the search and replace on.",
         "Second argument is the word that you will be replacing (before).",
         "Third argument is what you will be replacing the second argument with (after).",
         "NOTE: Preserve the case of the original word when you are replacing it. For example if you mean to replace the word 'Book' with the word 'dog', it should be replaced as 'Dog'",

From e9aa4b27a78ccc3e490743c876dee82bcc5e7acc Mon Sep 17 00:00:00 2001
From: Brett Guillory <kurzweilfreak@gmail.com>
Date: Sat, 13 Jun 2015 23:28:33 -0500
Subject: [PATCH 02/54] Added missing MDN Link

This bonfire "Missing letters"seems to be missing an important MDN link to "String.fromCharCode()", which is needed to get the missing character to return for the test. Since the missing character is obviously not in the string supplied, you cannot get the character code for it from the string.
---
 seed_data/challenges/basic-bonfires.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/seed_data/challenges/basic-bonfires.json b/seed_data/challenges/basic-bonfires.json
index 3773c4da22..e65268b535 100644
--- a/seed_data/challenges/basic-bonfires.json
+++ b/seed_data/challenges/basic-bonfires.json
@@ -966,7 +966,8 @@
         "expect(fearNotLetter('yz')).to.be.undefined;"
       ],
       "MDNlinks": [
-        "String.charCodeAt()"
+        "String.charCodeAt()",
+        "String.fromCharCode()"
       ],
       "challengeType": 5,
       "nameCn": "",

From f50cee119cb76dc6a8ccdda61f6c5a9ffa9dab16 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 17:26:37 +0200
Subject: [PATCH 03/54] More 'Convert HTML Entities' test cases. Fixes #924

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

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index df4b6bc16c..9858ca9b90 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -1104,6 +1104,10 @@
       ],
       "tests": [
         "assert.strictEqual(convert('Dolce & Gabbana'), 'Dolce &amp; Gabbana', 'should escape characters');",
+        "assert.strictEqual(convert('Hamburgers < Pizza < Tacos'), 'Hamburgers &lt; Pizza &lt; Tacos', 'should escape characters');",
+        "assert.strictEqual(convert('Sixty > twelve'), 'Sixty &gt; twelve', 'should escape characters');",
+        "assert.strictEqual(convert('Stuff in \"quotation marks\"'), 'Stuff in &quot;quotation marks&quot;', 'should escape characters');",
+        "assert.strictEqual(convert(\"Shindler's List\"), 'Shindler&apos;s List', 'should escape characters');",
         "assert.strictEqual(convert('abc'), 'abc', 'should handle strings with nothing to escape');"
       ],
       "MDNlinks": [

From 00c1cdef5b3fd0ea78e1ab9ad9ecb0555113b008 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 17:43:52 +0200
Subject: [PATCH 04/54] Fixed Zipline jQuery.getJSON() links. Fixes #918 #919

---
 seed/challenges/ziplines.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/seed/challenges/ziplines.json b/seed/challenges/ziplines.json
index f61a96280e..4bf2d531db 100644
--- a/seed/challenges/ziplines.json
+++ b/seed/challenges/ziplines.json
@@ -56,7 +56,7 @@
         "<span class='text-info'>Hint:</span> Here's an example call to Twitch.tv's JSON API: <code>https://api.twitch.tv/kraken/streams/freecodecamp</code>.",
         "<span class='text-info'>Hint:</span> The relevant documentation about this API call is here: <a href='https://github.com/justintv/Twitch-API/blob/master/v3_resources/streams.md#get-streamschannel' target='_blank'>https://github.com/justintv/Twitch-API/blob/master/v3_resources/streams.md#get-streamschannel</a>.",
         "<span class='text-info'>Hint:</span> Here's an array of the Twitch.tv usernames of people who regularly stream coding: <code>[\"freecodecamp\", \"storbeck\", \"terakilobyte\", \"habathcx\",\"RobotCaleb\",\"comster404\",\"brunofin\",\"thomasballinger\",\"noobs2ninjas\",\"beohoff\"]</code>",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],
@@ -87,7 +87,7 @@
         "Here are the <a href='http://en.wikipedia.org/wiki/User_story' target='_blank'>user stories</a> you must enable, and optional bonus user stories:",
         "<span class='text-info'>User Story:</span> As a user, I can click a button to show me a new random quote.",
         "<span class='text-info'>Bonus User Story:</span> As a user, I can press a button to tweet out a quote.",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],
@@ -120,7 +120,7 @@
         "<span class='text-info'>Bonus User Story:</span> As a user, I can see an icon depending on the temperature..",
         "<span class='text-info'>Bonus User Story:</span> As a user, I see a different background image depending on the temperature (e.g. snowy mountain, hot desert).",
         "<span class='text-info'>Bonus User Story:</span> As a user, I can push a button to toggle between Fahrenheit and Celsius.",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],
@@ -154,7 +154,7 @@
         "<span class='text-info'>User Story:</span> As a user, I can click a link to go directly to the post's discussion page.",
         "<span class='text-info'>Bonus User Story:</span> As a user, I can see how many upvotes each story has.",
         "<span class='text-info'>Hint:</span> Here's the Camper News Hot Stories API endpoint: <code>http://www.freecodecamp.com/stories/hotStories</code>.",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],
@@ -187,7 +187,7 @@
         "<span class='text-info'>Bonus User Story:</span>As a user, I can click a button to see a random Wikipedia entry.",
         "<span class='text-info'>Bonus User Story:</span>As a user, when I type in the search box, I can see a dropdown menu with autocomplete options for matching Wikipedia entries.",
         "<span class='text-info'>Hint:</span> Here's an entry on using Wikipedia's API: <code>http://www.mediawiki.org/wiki/API:Main_page</code>.",
-        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.each/'>jQuery's $.getJSON()</a> to consume APIs.",
+        "Remember to use <a href='/field-guide/how-do-i-get-help-when-I-get-stuck' target='_blank'>RSAP</a> if you get stuck. Try using <a href='http://api.jquery.com/jquery.getjson/'>jQuery's $.getJSON()</a> to consume APIs.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project, click this button and paste in a link to your CodePen project. Otherwise, we'll review it before you start your nonprofit projects.<br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
       ],

From 0038c48875a830fd8778d0391b0641e1f8c3068f Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 18:06:09 +0200
Subject: [PATCH 05/54] Improves check for catphotoapp.com. Fixes #914

---
 seed/challenges/basic-html5-and-css.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/basic-html5-and-css.json b/seed/challenges/basic-html5-and-css.json
index 3e0532d81a..d050f4d6dc 100644
--- a/seed/challenges/basic-html5-and-css.json
+++ b/seed/challenges/basic-html5-and-css.json
@@ -1005,7 +1005,7 @@
       ],
       "tests": [
         "assert((/cat photos/gi).test($('a').text()), 'Your <code>a</code> element should have the anchor text of \"cat photos\"')",
-        "assert($('a').filter(function(index) { return /com/gi.test($('a').attr('href')); }).length > 0, 'You need an <code>a</code> element that links to <code>http&#58;//catphotoapp.com<code>.')",
+        "assert(/http:\\/\\/catphotoapp\\.com/gi.test($('a').attr('href')), 'You need an <code>a</code> element that links to <code>http&#58;//catphotoapp.com<code>.')",
         "assert(editor.match(/<\\/a>/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure your <code>a</code> element has a closing tag.')"
       ],
       "challengeSeed": [

From 480c5dec0a6627a0e4507cb8fe7dadf51260f462 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 18:14:55 +0200
Subject: [PATCH 06/54] Test for almost palindromes. #911

---
 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 df4b6bc16c..cad7cb5228 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -180,7 +180,8 @@
         "assert.deepEqual(palindrome(\"not a palindrome\"), false);",
         "assert.deepEqual(palindrome(\"A man, a plan, a canal. Panama\"), true);",
         "assert.deepEqual(palindrome(\"never odd or even\"), true);",
-        "assert.deepEqual(palindrome(\"nope\"), false);"
+        "assert.deepEqual(palindrome(\"nope\"), false);",
+        "assert.deepEqual(palindrome(\"almostomla\"), false);"
       ],
       "challengeSeed": [
         "function palindrome(str) {",

From 663492c58222995850bfef3f9a8ccc2b038e0506 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Mon, 15 Jun 2015 18:26:44 +0200
Subject: [PATCH 07/54] Check fix in 'Bootstrap Grid'. #907

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

diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index eeac669f73..9f2b704153 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -626,7 +626,7 @@
         "The \"row\" class is applied to a <code>div</code>, and the buttons themselves can be wrapped within it."
       ],
       "tests": [
-        "assert($('div.row:has(button)'), 'Your buttons should all be wrapped within the same <code>div</code> element with the class \"row\".')",
+        "assert($('div.row:has(button)').length > 0, 'Your buttons should all be wrapped within the same <code>div</code> element with the class \"row\".')",
         "assert($('div.col-xs-4:has(button)').length > 2, 'Each of your Bootstrap buttons should be wrapped within its own a <code>div</code> element with the class \"col-xs-4\".')",
         "assert(editor.match(/<\\/button>/g) && editor.match(/<button/g) && editor.match(/<\\/button>/g).length === editor.match(/<button/g).length, 'Make sure each of your <code>button</code> elements has a closing tag.')",
         "assert(editor.match(/<\\/div>/g) && editor.match(/<div/g) && editor.match(/<\\/div>/g).length === editor.match(/<div/g).length, 'Make sure each of your <code>div</code> elements has a closing tag.')"

From a53114e7b617bb96a735eb481555467aa81066a2 Mon Sep 17 00:00:00 2001
From: Andrew Cay <Lemony-Andrew@users.noreply.github.com>
Date: Mon, 15 Jun 2015 22:47:17 -0700
Subject: [PATCH 08/54] Update and rename coursewaresJSFramework_0.0.5.js to
 coursewaresJSFramework_0.0.6.js

Added auto save(to local storage) for any progress. It will set the IDE text to whatever the user last saw within 24 hours.
The auto save happens every 1.5 seconds _after_ someone lifts a key.
---
 ...0.5.js => coursewaresJSFramework_0.0.6.js} | 66 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 3 deletions(-)
 rename public/js/lib/coursewares/{coursewaresJSFramework_0.0.5.js => coursewaresJSFramework_0.0.6.js} (77%)

diff --git a/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
similarity index 77%
rename from public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js
rename to public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
index 5e6de0e413..a339037b0e 100644
--- a/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js
+++ b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
@@ -40,6 +40,66 @@ editor.setOption("extraKeys", {
 });
 
 
+/*
+	Local Storage Update System By Andrew Cay(Resto)
+	localBonfire: singleton object that contains properties and methods related to
+		dealing with the localStorage system.
+	The keys work off of the variable challenge_name to make unique identifiers per bonfire
+	
+	Two extra functionalities: 
+	Added anonymous version checking system incase of future updates to the system
+	Added keyup listener to editor(myCodeMirror) so the last update has been saved to storage
+*/
+var localBonfire = {
+	version: 0.01,
+	keyVersion:"saveVersion",
+	keyStamp: challenge_Name + 'Stamp',
+	keyValue: challenge_Name + 'Val',
+	stampExpireTime: (1000 *60) *60 *24,
+	updateWait: 1500,// 1.5 seconds
+	updateTimeoutId: null
+};
+localBonfire.getEditorValue = function(){
+	return localStorage.getItem(localBonfire.keyValue);
+};
+localBonfire.getStampTime = function(){
+	//localstorage always saves as strings.
+	return Number.parseInt( localStorage.getItem(localBonfire.keyStamp) );
+};
+localBonfire.isAlive = function(){// returns true if IDE was edited within expire time
+	return ( Date.now() - localBonfire.getStampTime() < localBonfire.stampExpireTime );
+};
+localBonfire.updateStorage = function(){
+	if(typeof(Storage) !== undefined) {
+		var stamp = Date.now(),
+			value = editor.getValue();
+		localStorage.setItem(localBonfire.keyValue, value);
+		localStorage.setItem(localBonfire.keyStamp, stamp);
+	} else {
+		if( debugging ){
+			console.log('no web storage');
+		}
+	}
+	localBonfire.updateTimeoutId = null;
+	console.log('updated!');
+};
+// ANONYMOUS 1 TIME UPDATE VERSION
+(function(){
+	var savedVersion = localStorage.getItem('saveVersion');
+	if( savedVersion === null ){
+		localStorage.setItem(localBonfire.keyVersion, localBonfire.version);//just write current version
+	}else{
+		//do checking if not current version
+		if( savedVersion !== localBonfire.version ){
+			//update version
+		}
+	}
+})();
+
+editor.on('keyup', function(codMir, event){ 
+	window.clearTimeout(localBonfire.updateTimeoutId);
+	localBonfire.updateTimeoutId = window.setTimeout(localBonfire.updateStorage, localBonfire.updateWait);
+});
 
 var attempts = 0;
 if (attempts) {
@@ -71,15 +131,15 @@ var editorValue;
 var challengeSeed = challengeSeed || null;
 var tests = tests || [];
 
+
 var allSeeds = '';
 (function() {
   challengeSeed.forEach(function(elem) {
-    allSeeds += elem + '\n';
+	allSeeds += elem + '\n';
   });
 })();
 
-editorValue = allSeeds;
-
+editorValue = (localBonfire.isAlive())? localBonfire.getEditorValue() : allSeeds;
 
 myCodeMirror.setValue(editorValue);
 

From 7e420217eb973aa35774c127b8385597121e8c33 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 14:43:12 -0400
Subject: [PATCH 09/54] More https configuration

---
 server/server.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/server.js b/server/server.js
index e950611d24..cda6a0bf67 100755
--- a/server/server.js
+++ b/server/server.js
@@ -305,6 +305,7 @@ var options = {
 if (process.env.NODE_ENV === 'production') {
   app.start = function() {
     var server = https.createServer(options, app);
+    console.log(process.env.HOST, process.env.PORT);
     server.listen('https://' + process.env.HOST + ':' + app.get('port'), function () {
       console.log(
         'FreeCodeCamp server listening on port %d in %s mode',

From b25dd9416bd95f1df93b62f054687b0d499c76c4 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 14:43:49 -0400
Subject: [PATCH 10/54] More https configuration

---
 server/server.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/server.js b/server/server.js
index cda6a0bf67..c7240fb20c 100755
--- a/server/server.js
+++ b/server/server.js
@@ -306,6 +306,7 @@ if (process.env.NODE_ENV === 'production') {
   app.start = function() {
     var server = https.createServer(options, app);
     console.log(process.env.HOST, process.env.PORT);
+    console.log(options.cert);
     server.listen('https://' + process.env.HOST + ':' + app.get('port'), function () {
       console.log(
         'FreeCodeCamp server listening on port %d in %s mode',

From 645c0aac0e53f2a0092b24ad22b8361e9fc463d2 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 14:51:40 -0400
Subject: [PATCH 11/54] Server test

---
 server/server.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/server.js b/server/server.js
index c7240fb20c..74b28f1856 100755
--- a/server/server.js
+++ b/server/server.js
@@ -305,8 +305,7 @@ var options = {
 if (process.env.NODE_ENV === 'production') {
   app.start = function() {
     var server = https.createServer(options, app);
-    console.log(process.env.HOST, process.env.PORT);
-    console.log(options.cert);
+    console.log('https://' + process.env.HOST + ':' + process.env.PORT);
     server.listen('https://' + process.env.HOST + ':' + app.get('port'), function () {
       console.log(
         'FreeCodeCamp server listening on port %d in %s mode',

From e782e0310f4aef3b5a47786aa9d51353229fc992 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 15:04:20 -0400
Subject: [PATCH 12/54] Remove toString() on certificate reads as per
 http://stackoverflow.com/questions/20893025/cant-start-nodejs-https-server-v0-10-23

---
 server/ssl-config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/ssl-config.js b/server/ssl-config.js
index 7ac90dc7cf..6cbf418971 100644
--- a/server/ssl-config.js
+++ b/server/ssl-config.js
@@ -8,9 +8,9 @@ var fs = require('fs');
 if (process.env.NODE_ENV === 'production') {
   exports.privateKey =
     fs.readFileSync(path.join(__dirname,
-      '../../private/privatekey.pem')).toString();
+      '../../private/privatekey.pem'));
   exports.certificate =
     fs.readFileSync(path.join(__dirname,
-      '../../private/certificate.pem')).toString();
+      '../../private/certificate.pem'));
 
 }

From a662187d938879e4ca284caeaad572db20088ccd Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 15:24:55 -0400
Subject: [PATCH 13/54] More ssl setup

---
 server/server.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/server.js b/server/server.js
index 74b28f1856..f9b20edc01 100755
--- a/server/server.js
+++ b/server/server.js
@@ -312,6 +312,7 @@ if (process.env.NODE_ENV === 'production') {
         app.get('port'),
         app.get('env')
       );
+      app.emit('started', 'https://' + process.env.HOST + ':' + app.get('port'));
     });
   };
 } else {

From 2cb0a3d717edbb2dd88b6e20c91ce0f2315476e4 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 16 Jun 2015 12:32:12 -0700
Subject: [PATCH 14/54] futher improve calculator ux

---
 gulpfile.js                            |  8 ++-
 public/css/main.less                   | 12 +---
 server/boot/randomAPIs.js              |  2 +-
 server/views/resources/calculator.jade | 88 ++++++++++++++------------
 4 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 51678484e0..46c6cbd82d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -70,7 +70,7 @@ gulp.task('lint', function() {
     .pipe(eslint.format());
 });
 
-gulp.task('build', function() {
+gulp.task('less', function() {
   return gulp.src('./public/css/*.less')
     .pipe(less({
       paths: [ path.join(__dirname, 'less', 'includes') ]
@@ -78,4 +78,8 @@ gulp.task('build', function() {
     .pipe(gulp.dest('./public/css/'));
 });
 
-gulp.task('default', ['build', 'serve', 'sync']);
+gulp.task('watch', ['less', 'serve', 'sync'], function() {
+  gulp.watch('./public/css/*.less', ['less']);
+});
+
+gulp.task('default', ['less', 'serve', 'sync', 'watch']);
diff --git a/public/css/main.less b/public/css/main.less
index 424ae26933..aa6dc28c0c 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -1123,13 +1123,8 @@ hr {
 
 // Calculator styles
 
-.hidden-initially {
-  visibility: hidden;
-}
-
-#four p{
-  font-size: .6em;
-  color: black;
+.initially-hidden {
+  display: none;
 }
 
 .chart rect {
@@ -1137,8 +1132,7 @@ hr {
 }
 
 .chart text {
-  fill: #121401;
-  font: 13px sans-serif;
+  font-size: 14px;
   text-anchor: end;
 }
 
diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index 8836f4f638..b44226f82a 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -27,7 +27,7 @@ module.exports = function(app) {
   router.post('/get-help', getHelp);
   router.post('/get-pair', getPair);
   router.get('/chat', chat);
-  router.get('/bootcamp-calculator', bootcampCalculator);
+  router.get('/coding-bootcamp-cost-calculator', bootcampCalculator);
   router.get('/bootcamp-calculator.json', bootcampCalculatorJson);
   router.get('/twitch', twitch);
   router.get('/pmi-acp-agile-project-managers', agileProjectManagers);
diff --git a/server/views/resources/calculator.jade b/server/views/resources/calculator.jade
index 373100da77..3dfc658b1f 100644
--- a/server/views/resources/calculator.jade
+++ b/server/views/resources/calculator.jade
@@ -1,21 +1,16 @@
 extends ../layout
 block content
+    link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap2/bootstrap-switch.min.css')
+    script(src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.min.js")
     .panel.panel-info
         .panel-heading.text-center Coding Bootcamp Cost Calculator
         .panel-body
             .row
                 .col-xs-12.col-sm-10.col-sm-offset-1
-                    h2.text-primary#chosen
+                    h3.text-primary#chosen Coming from _______, and making $_______, your true costs will be:
                     #chart-controls.initially-hidden
-                        form
-                            label
-                                input(type='radio', name='mode', value='grouped')
-                                | &thinsp; Grouped &nbsp;
-                            label
-                                input(type='radio', name='mode', value='stacked')
-                                | &thinsp; Stacked
-                            br
-                            a(href='/bootcamp-calculator.json') View Data Source JSON
+                        .text-center
+                            button#transform.btn.btn-primary.btn-lg.animated Transform
                     #city-buttons
                         h2 Where do you live?
                         .col-xs-12.col-sm-6.col-md-4.btn-nav
@@ -56,7 +51,7 @@ block content
                             button#toronto.btn.btn-primary.btn-block.btn-lg Toronto
                         .col-xs-12.btn-nav
                             button#other.btn.btn-primary.btn-block.btn-lg Other
-                    #income.hidden-by-default
+                    #income.initially-hidden
                         h2 How much money did you make last year (in USD)?
                         .col-xs-12.col-sm-6.col-md-4.btn-nav
                             button#0.btn.btn-primary.btn-block.btn-lg(href='#') $0
@@ -88,25 +83,39 @@ block content
                             button#180000.btn.btn-primary.btn-block.btn-lg(href='#') $180,000
                         .col-xs-12.col-sm-6.col-md-4.btn-nav
                             button#200000.btn.btn-primary.btn-block.btn-lg(href='#') $200,000
-                    #chart.hidden-by-default
-                        svg.chart
-
+                    #chart.initially-hidden
+                        .d3-centered
+                            svg.chart
+                    #explanation.initially-hidden
+                        .text-center
+                            a(href='/coding-bootcamp-cost-calculator.json') View Data Source JSON
+                            span &nbsp; &bullet; &nbsp;
+                            a(href='/coding-bootcamp-cost-calculator') Recalculate
+                        p.large-p Test
                     script.
                         $(document).ready(function () {
                             var bootcamps = !{JSON.stringify(bootcampJson)};
                             var city = "";
-                            var cityArray = ["san-fransisco", "los-angeles", "chicago", "austin", "new-york-city", "melbourne", "hong-kong", "seattle", "singapore", "london", "toronto", "portland", "brisbane", "atlanta", "raleigh-durham"];
+                            $( "body" ).data( "state", "stacked");
                             $('#city-buttons').on("click", "button", function () {
+                                $(this).addClass('animated pulse');
+                                setTimeout(function () {
+                                    $('#city-buttons').hide();
+                                    $('#chosen').text('Coming from ' + city.replace(/-/g, ' ').replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}));
+                                    $('#income').addClass('animated fadeIn').show();
+                                }, 1000);
                                 city = $(this).attr("id");
-                                $('#city-buttons').hide();
-                                $('#chosen').text('Coming from ' + city.replace(/-/g, ' ').replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}));
-                                $('#income').css({visibility: 'visible'});
                             });
                             $('#income').on("click", "button", function() {
-                                $('#income').hide();
-                                $('#chart').css({visibility: 'visible'});
+                                $(this).addClass('animated pulse');
+                                setTimeout(function () {
+                                    $('#income').hide();
+                                    $('#chart').show();
+                                    $('#chart-controls').addClass('animated fadeIn').show();
+                                    $('#explanation').addClass('animated fadeIn').show();
+                                }, 1000);
                                 var lastYearsIncome = parseInt($(this).attr("id"));
-                                $('#chosen').append(' making $' + lastYearsIncome.toString().replace(/0000/, '0,000') + ', your true costs are:');
+                                $('#chosen').append(', and making $' + lastYearsIncome.toString().replace(/0000/, '0,000') + ', your true costs will be:');
                                 var categoryNames = ['Opportunity Cost at Current Wage', 'Financing Cost', 'Housing Cost', 'Tuition / Wage Garnishing'];
                                 bootcamps.forEach(function (camp) {
                                     var x0 = 0;
@@ -117,7 +126,7 @@ block content
                                     }
                                     camp.mapping = [{
                                         name: camp.name,
-                                        label: 'Opportunity Cost at Current Wage',
+                                        label: 'Tuition / Wage Garnishing',
                                         value: +camp.cost,
                                         x0: x0,
                                         x1: x0 += +camp.cost
@@ -135,7 +144,7 @@ block content
                                         x1: x0 += weeklyHousing * camp.weeks
                                     }, {
                                         name: camp.name,
-                                        label: 'Tuition / Wage Garnishing',
+                                        label: 'Opportunity Cost at Current Wage',
                                         value: +(Math.floor(camp.weeks * lastYearsIncome / 50)),
                                         x0: camp.finance ? +(Math.floor(camp.cost * 1.09519) + weeklyHousing * camp.weeks) : +camp.cost + weeklyHousing * camp.weeks,
                                         x1: x0 += +(Math.floor(camp.weeks * lastYearsIncome / 50))
@@ -145,11 +154,9 @@ block content
                                 bootcamps.sort(function(a, b) { return a.total - b.total; });
                                 maxValue = 0;
                                 bootcamps.forEach(function (camp) {
-                                    camp.mapping.forEach(function (thing) {
-                                        //console.log(thing.value );
-                                        if (thing.value > maxValue) {
-                                            maxValue = thing.value;
-                                            console.log(maxValue);
+                                    camp.mapping.forEach(function (elem) {
+                                        if (elem.value > maxValue) {
+                                            maxValue = elem.value;
                                         }
                                     });
                                 });
@@ -225,19 +232,22 @@ block content
                                         .attr("width", function (d) {
                                             return xScale((d.x1) - (d.x0));
                                         });
-                                d3.selectAll("input").on("change", change);
-                                var timeout= setTimeout(function () {
-                                    d3.select("input[value=\"stacked\"]").property("checked",true).each(change);
-                                    // d3.select("input[value=\"stacked\"]").property("checked",true).each(change);
-                                }, 4000);
-                                var timeout= setTimeout(function () {
-                                    d3.select("input[value=\"grouped\"]").property("checked",true).each(change);
-                                }, 1500);
+                                d3.selectAll("#transform").on("click", function() {
+                                    $('#transform').addClass('pulse');
+                                    change();
+                                    setTimeout( function() {
+                                        $('#transform').removeClass('pulse');
+                                    }, 1000);
+                                });
 
                                 function change() {
-                                    clearTimeout(timeout);
-                                    if (this.value === "grouped") transitionGrouped();
-                                    else transitionStacked();
+                                    if ($("body").data("state") === "stacked") {
+                                        transitionGrouped();
+                                        $("body").data("state", "grouped");
+                                    } else {
+                                        transitionStacked();
+                                        $("body").data("state", "stacked");
+                                    }
                                 }
 
                                 function transitionGrouped() {

From 9e8796a0c42523a215c8c6d0479031a528f81c4d Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 15:38:22 -0400
Subject: [PATCH 15/54] More tweaking

---
 server/server.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/server/server.js b/server/server.js
index f9b20edc01..0f03dd98d8 100755
--- a/server/server.js
+++ b/server/server.js
@@ -21,7 +21,6 @@ var https = require('https'),
   flash = require('express-flash'),
   path = require('path'),
   expressValidator = require('express-validator'),
-  forceDomain = require('forcedomain'),
   lessMiddleware = require('less-middleware'),
   pmx = require('pmx'),
 
@@ -303,18 +302,16 @@ var options = {
 };
 
 if (process.env.NODE_ENV === 'production') {
-  app.start = function() {
-    var server = https.createServer(options, app);
-    console.log('https://' + process.env.HOST + ':' + process.env.PORT);
-    server.listen('https://' + process.env.HOST + ':' + app.get('port'), function () {
-      console.log(
-        'FreeCodeCamp server listening on port %d in %s mode',
-        app.get('port'),
-        app.get('env')
-      );
-      app.emit('started', 'https://' + process.env.HOST + ':' + app.get('port'));
-    });
-  };
+  var server = https.createServer(options, app);
+  console.log('https://' + process.env.HOST + ':' + process.env.PORT);
+  server.listen('https://' + process.env.HOST + ':' + app.get('port'), function () {
+    console.log(
+      'FreeCodeCamp server listening on port %d in %s mode',
+      app.get('port'),
+      app.get('env')
+    );
+    app.emit('started', 'https://' + process.env.HOST + ':' + app.get('port'));
+  });
 } else {
   app.start = function () {
     app.listen(app.get('port'), function () {
@@ -325,11 +322,12 @@ if (process.env.NODE_ENV === 'production') {
       );
     });
   };
+  if (require.main === module) {
+    app.start();
+  }
 }
 
 // start the server if `$ node server.js`
-if (require.main === module) {
-  app.start();
-}
+
 
 module.exports = app;

From 7915e8a77e10238c0a9d8fa3c56d9140b74512e2 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 15:41:59 -0400
Subject: [PATCH 16/54] 99 problems, and production only errors are 98 of them

---
 server/server.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/server/server.js b/server/server.js
index 0f03dd98d8..2b0eefa100 100755
--- a/server/server.js
+++ b/server/server.js
@@ -313,18 +313,13 @@ if (process.env.NODE_ENV === 'production') {
     app.emit('started', 'https://' + process.env.HOST + ':' + app.get('port'));
   });
 } else {
-  app.start = function () {
-    app.listen(app.get('port'), function () {
-      console.log(
-        'FreeCodeCamp server listening on port %d in %s mode',
-        app.get('port'),
-        app.get('env')
-      );
-    });
-  };
-  if (require.main === module) {
-    app.start();
-  }
+  app.listen(app.get('port'), function () {
+    console.log(
+      'FreeCodeCamp server listening on port %d in %s mode',
+      app.get('port'),
+      app.get('env')
+    );
+  });
 }
 
 // start the server if `$ node server.js`

From 1607fe0ba50cb00993c1e14c58254b505d46f616 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 15:51:04 -0400
Subject: [PATCH 17/54] Updates server listen in production

---
 server/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/server.js b/server/server.js
index 2b0eefa100..69e02e8496 100755
--- a/server/server.js
+++ b/server/server.js
@@ -304,7 +304,7 @@ var options = {
 if (process.env.NODE_ENV === 'production') {
   var server = https.createServer(options, app);
   console.log('https://' + process.env.HOST + ':' + process.env.PORT);
-  server.listen('https://' + process.env.HOST + ':' + app.get('port'), function () {
+  server.listen(app.get('port'), function () {
     console.log(
       'FreeCodeCamp server listening on port %d in %s mode',
       app.get('port'),

From 810bf9a3f7e5be4143694441b701ad4c8c50a307 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 15:59:22 -0400
Subject: [PATCH 18/54] force https for blob url in _frame.js. Updates helmet
 to allow more inspectlet domains.

---
 public/js/lib/jailed/_frame.js | 2 +-
 server/server.js               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/js/lib/jailed/_frame.js b/public/js/lib/jailed/_frame.js
index fa310643fd..7f464f02de 100644
--- a/public/js/lib/jailed/_frame.js
+++ b/public/js/lib/jailed/_frame.js
@@ -36,7 +36,7 @@ try {
   blobUrl = blobUrl.getBlob();
 }
 
-var worker = new Worker(URL.createObjectURL(blobUrl));
+var worker = new Worker(URL.createObjectURL('https:' + blobUrl));
 
 // telling worker to load _pluginWeb.js (see blob code above)
 worker.postMessage({
diff --git a/server/server.js b/server/server.js
index 69e02e8496..cc69e11ae3 100755
--- a/server/server.js
+++ b/server/server.js
@@ -132,7 +132,8 @@ var trusted = [
   'wss://inspectletws.herokuapp.com/',
   'http://hn.inspectlet.com/',
   '*.googleapis.com',
-  '*.gstatic.com'
+  '*.gstatic.com',
+  'https://hn.inspectlet.com/'
 ];
 
 app.use(helmet.csp({

From 40b5b05ea4a7a7f01577a69254249b2cdccaf6d3 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 16 Jun 2015 13:03:13 -0700
Subject: [PATCH 19/54] factor JavaScript and JSON into separate files

---
 public/js/calculator.js                | 268 ++++++++++++++++++++++++
 server/boot/randomAPIs.js              |   2 +-
 server/views/resources/calculator.jade | 271 +------------------------
 3 files changed, 275 insertions(+), 266 deletions(-)
 create mode 100644 public/js/calculator.js

diff --git a/public/js/calculator.js b/public/js/calculator.js
new file mode 100644
index 0000000000..bb92d6a65b
--- /dev/null
+++ b/public/js/calculator.js
@@ -0,0 +1,268 @@
+$(document).ready(function () {
+  var bootcamps = ''
+  $.getJSON('/coding-bootcamp-cost-calculator.json', function(data) {
+    bootcamps = data;
+  });
+  var city = "";
+  $("body").data("state", "stacked");
+  $('#city-buttons').on("click", "button", function () {
+    $(this).addClass('animated pulse');
+    city = $(this).attr("id");
+    $('#chosen').text('Coming from ' + city.replace(/-/g, ' ').replace(/\w\S*/g, function (txt) {
+        return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+      }) + ', and making $_______, your true costs will be:');
+    setTimeout(function () {
+      $('#city-buttons').hide();
+      $('#income').addClass('animated fadeIn').show();
+    }, 1000);
+  });
+  $('#income').on("click", "button", function () {
+    $(this).addClass('animated pulse');
+    setTimeout(function () {
+      $('#income').hide();
+      $('#chart').show();
+      $('#chart-controls').addClass('animated fadeIn').show();
+      $('#explanation').addClass('animated fadeIn').show();
+    }, 1000);
+    var lastYearsIncome = parseInt($(this).attr("id"));
+    $('#chosen').text('Coming from ' + city.replace(/-/g, ' ').replace(/\w\S*/g, function (txt) {
+        return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
+      }) + ', and making $' + lastYearsIncome.toString().replace(/0000$/, '0,000') + ', your true costs will be:');
+    var categoryNames = ['Opportunity Cost at Current Wage', 'Financing Cost', 'Housing Cost', 'Tuition / Wage Garnishing'];
+    bootcamps.forEach(function (camp) {
+      var x0 = 0;
+      if (camp.cities.indexOf(city) > -1) {
+        weeklyHousing = 0;
+      } else {
+        weeklyHousing = +camp.housing;
+      }
+      camp.mapping = [{
+        name: camp.name,
+        label: 'Tuition / Wage Garnishing',
+        value: +camp.cost,
+        x0: x0,
+        x1: x0 += +camp.cost
+      }, {
+        name: camp.name,
+        label: 'Financing Cost',
+        value: +Math.floor(camp.cost * .09519),
+        x0: +camp.cost,
+        x1: camp.finance ? x0 += +Math.floor(camp.cost * .09519) : 0
+      }, {
+        name: camp.name,
+        label: 'Housing Cost',
+        value: +weeklyHousing * camp.weeks,
+        x0: camp.finance ? +Math.floor(camp.cost * 1.09519) : camp.cost,
+        x1: x0 += weeklyHousing * camp.weeks
+      }, {
+        name: camp.name,
+        label: 'Opportunity Cost at Current Wage',
+        value: +(Math.floor(camp.weeks * lastYearsIncome / 50)),
+        x0: camp.finance ? +(Math.floor(camp.cost * 1.09519) + weeklyHousing * camp.weeks) : +camp.cost + weeklyHousing * camp.weeks,
+        x1: x0 += +(Math.floor(camp.weeks * lastYearsIncome / 50))
+      }];
+      camp.total = camp.mapping[camp.mapping.length - 1].x1;
+    });
+    bootcamps.sort(function (a, b) {
+      return a.total - b.total;
+    });
+    maxValue = 0;
+    bootcamps.forEach(function (camp) {
+      camp.mapping.forEach(function (elem) {
+        if (elem.value > maxValue) {
+          maxValue = elem.value;
+        }
+      });
+    });
+    var xStackMax = d3.max(bootcamps, function (d) {
+        return d.total;
+      }), //Scale for Stacked
+      xGroupMax = bootcamps.map(function (camp) {
+        return camp.mapping.reduce(function (a, b) {
+          return a.value > b.value ? a.value : b.value;
+        });
+      }).reduce(function (a, b) {
+        return a > b ? a : b;
+      });
+    var margin = {
+        top: 30,
+        right: 60,
+        bottom: 50,
+        left: 140
+      },
+      width = 800 - margin.left - margin.right,
+      height = 1200 - margin.top - margin.bottom;
+    var barHeight = 20;
+    var xScale = d3.scale.linear()
+      .domain([0, xStackMax])
+      .rangeRound([0, width]);
+    var y0Scale = d3.scale.ordinal()
+      .domain(bootcamps.map(function (d) {
+        return d.name;
+      }))
+      .rangeRoundBands([0, height], .1);
+    var y1Scale = d3.scale.ordinal()
+      .domain(categoryNames).rangeRoundBands([0, y0Scale.rangeBand()]);
+    var color = d3.scale.ordinal()
+      .range(["#215f1e", "#5f5c1e", "#1e215f", "#5c1e5f"])
+      .domain(categoryNames);
+    var svg = d3.select("svg")
+      .attr("width", width + margin.left + margin.right)
+      .attr("height", height + margin.top + margin.bottom)
+      .append("g")
+      .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+    var selection = svg.selectAll(".series")
+      .data(bootcamps)
+      .enter().append("g")
+      .attr("class", "series")
+      .attr("transform", function (d) {
+        return "translate(0," + y0Scale(d.name) + ")";
+      });
+    var rect = selection.selectAll("rect")
+      .data(function (d) {
+        return d.mapping;
+      })
+      .enter().append("rect")
+      .attr("x", 0)
+      .attr("width", 0)
+      .attr("height", y0Scale.rangeBand())
+      .style("fill", function (d) {
+        return color(d.label);
+      })
+      .style("stroke", "white")
+      .on("mouseover", function (d) {
+        showPopover.call(this, d);
+      })
+      .on("mouseout", function (d) {
+        removePopovers();
+      });
+    rect.transition()
+      .delay(function (d, i) {
+        return i * 10;
+      })
+      .attr("x", function (d) {
+        return xScale(d.x0);
+      })
+      .attr("width", function (d) {
+        return xScale((d.x1) - (d.x0));
+      });
+    d3.selectAll("#transform").on("click", function () {
+      $('#transform').addClass('animated pulse');
+      change();
+      setTimeout(function () {
+        $('#transform').removeClass('animated pulse');
+      }, 1000);
+    });
+
+    function change() {
+      if ($("body").data("state") === "stacked") {
+        transitionGrouped();
+        $("body").data("state", "grouped");
+      } else {
+        transitionStacked();
+        $("body").data("state", "stacked");
+      }
+    }
+
+    function transitionGrouped() {
+      xScale.domain = ([0, xGroupMax]);
+      rect.transition()
+        .duration(500)
+        .delay(function (d, i) {
+          return i * 10;
+        })
+        .attr("width", function (d) {
+          return xScale((d.x1) - (d.x0));
+        })
+        .transition()
+        .attr("y", function (d) {
+          return y1Scale(d.label);
+        })
+        .attr("x", 0)
+        .attr("height", y1Scale.rangeBand())
+    }
+
+    function transitionStacked() {
+      xScale.domain = ([0, xStackMax]);
+      rect.transition()
+        .duration(500)
+        .delay(function (d, i) {
+          return i * 10;
+        })
+        .attr("x", function (d) {
+          return xScale(d.x0);
+        })
+        .transition()
+        .attr("y", function (d) {
+          return y0Scale(d.label);
+        })
+        .attr("height", y0Scale.rangeBand())
+    }
+
+    //axes
+    var xAxis = d3.svg.axis()
+      .scale(xScale)
+      .orient("bottom");
+    var yAxis = d3.svg.axis()
+      .scale(y0Scale)
+      .orient("left");
+    svg.append("g")
+      .attr("class", "y axis")
+      .call(yAxis);
+    svg.append("g")
+      .attr("class", "x axis")
+      .attr("transform", "translate(0," + height + ")")
+      .call(xAxis)
+      .append("text")
+      .attr("x", 300)
+      .attr("y", 35)
+      .attr("dy", ".35em")
+      .style("text-anchor", "middle")
+      .text("Cost in $USD");
+    //tooltips
+    function removePopovers() {
+      $('.popover').each(function () {
+        $(this).remove();
+      });
+    }
+
+    function showPopover(d) {
+      $(this).popover({
+        title: d.name,
+        placement: 'auto top',
+        container: 'body',
+        trigger: 'manual',
+        html: true,
+        content: function () {
+          return d.label +
+            "<br/>$" +
+            d3.format(",")(d.value ? d.value : d.x1 - d.x0);
+        }
+      });
+      $(this).popover('show')
+    }
+
+    //legends
+    var legend = svg.selectAll(".legend")
+      .data(categoryNames.slice().reverse())
+      .enter().append("g")
+      .attr("class", "legend")
+      .attr("transform", function (d, i) {
+        return "translate(30," + i * y0Scale.rangeBand() * 1.1 + ")";
+      });
+    legend.append("rect")
+      .attr("x", width - y0Scale.rangeBand())
+      .attr("width", y0Scale.rangeBand())
+      .attr("height", y0Scale.rangeBand())
+      .style("fill", color)
+      .style("stroke", "white");
+    legend.append("text")
+      .attr("x", width - y0Scale.rangeBand() * 1.2)
+      .attr("y", 12)
+      .attr("dy", ".35em")
+      .style("text-anchor", "end")
+      .text(function (d) {
+        return d;
+      });
+  });
+});
diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index b44226f82a..7dd89b1b4f 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -28,7 +28,7 @@ module.exports = function(app) {
   router.post('/get-pair', getPair);
   router.get('/chat', chat);
   router.get('/coding-bootcamp-cost-calculator', bootcampCalculator);
-  router.get('/bootcamp-calculator.json', bootcampCalculatorJson);
+  router.get('/coding-bootcamp-cost-calculator.json', bootcampCalculatorJson);
   router.get('/twitch', twitch);
   router.get('/pmi-acp-agile-project-managers', agileProjectManagers);
   router.get('/pmi-acp-agile-project-managers-form', agileProjectManagersForm);
diff --git a/server/views/resources/calculator.jade b/server/views/resources/calculator.jade
index 3dfc658b1f..8ae888041b 100644
--- a/server/views/resources/calculator.jade
+++ b/server/views/resources/calculator.jade
@@ -1,16 +1,12 @@
 extends ../layout
 block content
-    link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/css/bootstrap2/bootstrap-switch.min.css')
-    script(src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/3.3.2/js/bootstrap-switch.min.js")
+    script(src="../../../js/calculator.js")
     .panel.panel-info
         .panel-heading.text-center Coding Bootcamp Cost Calculator
         .panel-body
             .row
                 .col-xs-12.col-sm-10.col-sm-offset-1
                     h3.text-primary#chosen Coming from _______, and making $_______, your true costs will be:
-                    #chart-controls.initially-hidden
-                        .text-center
-                            button#transform.btn.btn-primary.btn-lg.animated Transform
                     #city-buttons
                         h2 Where do you live?
                         .col-xs-12.col-sm-6.col-md-4.btn-nav
@@ -51,6 +47,7 @@ block content
                             button#toronto.btn.btn-primary.btn-block.btn-lg Toronto
                         .col-xs-12.btn-nav
                             button#other.btn.btn-primary.btn-block.btn-lg Other
+                            .spacer
                     #income.initially-hidden
                         h2 How much money did you make last year (in USD)?
                         .col-xs-12.col-sm-6.col-md-4.btn-nav
@@ -83,272 +80,16 @@ block content
                             button#180000.btn.btn-primary.btn-block.btn-lg(href='#') $180,000
                         .col-xs-12.col-sm-6.col-md-4.btn-nav
                             button#200000.btn.btn-primary.btn-block.btn-lg(href='#') $200,000
+                            .spacer
                     #chart.initially-hidden
                         .d3-centered
                             svg.chart
                     #explanation.initially-hidden
                         .text-center
+                            .text-center
+                                button#transform.btn.btn-primary.btn-block.btn-lg Transform
+                            .button-spacer
                             a(href='/coding-bootcamp-cost-calculator.json') View Data Source JSON
                             span &nbsp; &bullet; &nbsp;
                             a(href='/coding-bootcamp-cost-calculator') Recalculate
                         p.large-p Test
-                    script.
-                        $(document).ready(function () {
-                            var bootcamps = !{JSON.stringify(bootcampJson)};
-                            var city = "";
-                            $( "body" ).data( "state", "stacked");
-                            $('#city-buttons').on("click", "button", function () {
-                                $(this).addClass('animated pulse');
-                                setTimeout(function () {
-                                    $('#city-buttons').hide();
-                                    $('#chosen').text('Coming from ' + city.replace(/-/g, ' ').replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}));
-                                    $('#income').addClass('animated fadeIn').show();
-                                }, 1000);
-                                city = $(this).attr("id");
-                            });
-                            $('#income').on("click", "button", function() {
-                                $(this).addClass('animated pulse');
-                                setTimeout(function () {
-                                    $('#income').hide();
-                                    $('#chart').show();
-                                    $('#chart-controls').addClass('animated fadeIn').show();
-                                    $('#explanation').addClass('animated fadeIn').show();
-                                }, 1000);
-                                var lastYearsIncome = parseInt($(this).attr("id"));
-                                $('#chosen').append(', and making $' + lastYearsIncome.toString().replace(/0000/, '0,000') + ', your true costs will be:');
-                                var categoryNames = ['Opportunity Cost at Current Wage', 'Financing Cost', 'Housing Cost', 'Tuition / Wage Garnishing'];
-                                bootcamps.forEach(function (camp) {
-                                    var x0 = 0;
-                                    if (camp.cities.indexOf(city) > -1) {
-                                        weeklyHousing = 0;
-                                    } else {
-                                        weeklyHousing = +camp.housing;
-                                    }
-                                    camp.mapping = [{
-                                        name: camp.name,
-                                        label: 'Tuition / Wage Garnishing',
-                                        value: +camp.cost,
-                                        x0: x0,
-                                        x1: x0 += +camp.cost
-                                    }, {
-                                        name: camp.name,
-                                        label: 'Financing Cost',
-                                        value: +Math.floor(camp.cost * .09519),
-                                        x0: +camp.cost,
-                                        x1: camp.finance ? x0 += +Math.floor(camp.cost * .09519) : 0
-                                    }, {
-                                        name: camp.name,
-                                        label: 'Housing Cost',
-                                        value: +weeklyHousing * camp.weeks,
-                                        x0: camp.finance ? +Math.floor(camp.cost * 1.09519) : camp.cost,
-                                        x1: x0 += weeklyHousing * camp.weeks
-                                    }, {
-                                        name: camp.name,
-                                        label: 'Opportunity Cost at Current Wage',
-                                        value: +(Math.floor(camp.weeks * lastYearsIncome / 50)),
-                                        x0: camp.finance ? +(Math.floor(camp.cost * 1.09519) + weeklyHousing * camp.weeks) : +camp.cost + weeklyHousing * camp.weeks,
-                                        x1: x0 += +(Math.floor(camp.weeks * lastYearsIncome / 50))
-                                    }];
-                                    camp.total = camp.mapping[camp.mapping.length - 1].x1;
-                                });
-                                bootcamps.sort(function(a, b) { return a.total - b.total; });
-                                maxValue = 0;
-                                bootcamps.forEach(function (camp) {
-                                    camp.mapping.forEach(function (elem) {
-                                        if (elem.value > maxValue) {
-                                            maxValue = elem.value;
-                                        }
-                                    });
-                                });
-                                var xStackMax = d3.max(bootcamps, function (d) {
-                                            return d.total;
-                                        }), //Scale for Stacked
-                                        xGroupMax = bootcamps.map(function (camp) {
-                                            return camp.mapping.reduce(function (a, b) {
-                                                return a.value > b.value ? a.value : b.value;
-                                            });
-                                        }).reduce(function (a, b) {
-                                            return a > b ? a : b;
-                                        });
-                                var margin = {
-                                            top: 30,
-                                            right: 60,
-                                            bottom: 50,
-                                            left: 140
-                                        },
-                                        width = 800 - margin.left - margin.right,
-                                        height = 1200 - margin.top - margin.bottom;
-                                var barHeight = 20;
-                                var xScale = d3.scale.linear()
-                                        .domain([0, xStackMax])
-                                        .rangeRound([0, width]);
-                                var y0Scale = d3.scale.ordinal()
-                                        .domain(bootcamps.map(function (d) {
-                                            return d.name;
-                                        }))
-                                        .rangeRoundBands([0, height], .1);
-                                var y1Scale = d3.scale.ordinal()
-                                        .domain(categoryNames).rangeRoundBands([0, y0Scale.rangeBand()]);
-                                var color = d3.scale.ordinal()
-                                    .range(["#215f1e", "#5f5c1e", "#1e215f", "#5c1e5f"])
-                                    .domain(categoryNames);
-                                var svg = d3.select("svg")
-                                        .attr("width", width + margin.left + margin.right)
-                                        .attr("height", height + margin.top + margin.bottom)
-                                        .append("g")
-                                        .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-                                var selection = svg.selectAll(".series")
-                                        .data(bootcamps)
-                                        .enter().append("g")
-                                        .attr("class", "series")
-                                        .attr("transform", function (d) {
-                                            return "translate(0," + y0Scale(d.name) + ")";
-                                        });
-                                var rect = selection.selectAll("rect")
-                                        .data(function (d) {
-                                            return d.mapping;
-                                        })
-                                        .enter().append("rect")
-                                        .attr("x", 0)
-                                        .attr("width", 0)
-                                        .attr("height", y0Scale.rangeBand())
-                                        .style("fill", function (d) {
-                                            return color(d.label);
-                                        })
-                                        .style("stroke", "white")
-                                        .on("mouseover", function (d) {
-                                            showPopover.call(this, d);
-                                        })
-                                        .on("mouseout", function (d) {
-                                            removePopovers();
-                                        });
-                                rect.transition()
-                                        .delay(function (d, i) {
-                                            return i * 10;
-                                        })
-                                        .attr("x", function (d) {
-                                            return xScale(d.x0);
-                                        })
-                                        .attr("width", function (d) {
-                                            return xScale((d.x1) - (d.x0));
-                                        });
-                                d3.selectAll("#transform").on("click", function() {
-                                    $('#transform').addClass('pulse');
-                                    change();
-                                    setTimeout( function() {
-                                        $('#transform').removeClass('pulse');
-                                    }, 1000);
-                                });
-
-                                function change() {
-                                    if ($("body").data("state") === "stacked") {
-                                        transitionGrouped();
-                                        $("body").data("state", "grouped");
-                                    } else {
-                                        transitionStacked();
-                                        $("body").data("state", "stacked");
-                                    }
-                                }
-
-                                function transitionGrouped() {
-                                    xScale.domain = ([0, xGroupMax]);
-                                    rect.transition()
-                                            .duration(500)
-                                            .delay(function (d, i) {
-                                                return i * 10;
-                                            })
-                                            .attr("width", function (d) {
-                                                return xScale((d.x1) - (d.x0));
-                                            })
-                                            .transition()
-                                            .attr("y", function (d) {
-                                                return y1Scale(d.label);
-                                            })
-                                            .attr("x", 0)
-                                            .attr("height", y1Scale.rangeBand())
-                                }
-
-                                function transitionStacked() {
-                                    xScale.domain = ([0, xStackMax]);
-                                    rect.transition()
-                                            .duration(500)
-                                            .delay(function (d, i) {
-                                                return i * 10;
-                                            })
-                                            .attr("x", function (d) {
-                                                return xScale(d.x0);
-                                            })
-                                            .transition()
-                                            .attr("y", function (d) {
-                                                return y0Scale(d.label);
-                                            })
-                                            .attr("height", y0Scale.rangeBand())
-                                }
-
-                                //axes
-                                var xAxis = d3.svg.axis()
-                                        .scale(xScale)
-                                        .orient("bottom");
-                                var yAxis = d3.svg.axis()
-                                        .scale(y0Scale)
-                                        .orient("left");
-                                svg.append("g")
-                                        .attr("class", "y axis")
-                                        .call(yAxis);
-                                svg.append("g")
-                                        .attr("class", "x axis")
-                                        .attr("transform", "translate(0," + height + ")")
-                                        .call(xAxis)
-                                        .append("text")
-                                        .attr("x", 300)
-                                        .attr("y", 35)
-                                        .attr("dy", ".35em")
-                                        .style("text-anchor", "middle")
-                                        .text("Cost in $USD");
-                                //tooltips
-                                function removePopovers() {
-                                    $('.popover').each(function () {
-                                        $(this).remove();
-                                    });
-                                }
-
-                                function showPopover(d) {
-                                    $(this).popover({
-                                        title: d.name,
-                                        placement: 'auto top',
-                                        container: 'body',
-                                        trigger: 'manual',
-                                        html: true,
-                                        content: function () {
-                                            return d.label +
-                                                    "<br/>$" +
-                                                    d3.format(",")(d.value ? d.value : d.x1 - d.x0);
-                                        }
-                                    });
-                                    $(this).popover('show')
-                                }
-
-                                //legends
-                                var legend = svg.selectAll(".legend")
-                                        .data(categoryNames.slice().reverse())
-                                        .enter().append("g")
-                                        .attr("class", "legend")
-                                        .attr("transform", function (d, i) {
-                                            return "translate(30," + i * y0Scale.rangeBand() * 1.1 + ")";
-                                        });
-                                legend.append("rect")
-                                        .attr("x", width - y0Scale.rangeBand())
-                                        .attr("width", y0Scale.rangeBand())
-                                        .attr("height", y0Scale.rangeBand())
-                                        .style("fill", color)
-                                        .style("stroke", "white");
-                                legend.append("text")
-                                        .attr("x", width - y0Scale.rangeBand() * 1.2)
-                                        .attr("y", 12)
-                                        .attr("dy", ".35em")
-                                        .style("text-anchor", "end")
-                                        .text(function (d) {
-                                            return d;
-                                        });
-                                });
-                            });

From 8735f164f844d3d383f5e48b0c22d024f0c015d1 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 16 Jun 2015 16:28:09 -0400
Subject: [PATCH 20/54] Remove https from blob code

---
 public/js/lib/jailed/_frame.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/lib/jailed/_frame.js b/public/js/lib/jailed/_frame.js
index 7f464f02de..fa310643fd 100644
--- a/public/js/lib/jailed/_frame.js
+++ b/public/js/lib/jailed/_frame.js
@@ -36,7 +36,7 @@ try {
   blobUrl = blobUrl.getBlob();
 }
 
-var worker = new Worker(URL.createObjectURL('https:' + blobUrl));
+var worker = new Worker(URL.createObjectURL(blobUrl));
 
 // telling worker to load _pluginWeb.js (see blob code above)
 worker.postMessage({

From 2e1babb12dc7618a03971cfea96be71f7659d51a Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 16 Jun 2015 13:46:24 -0700
Subject: [PATCH 21/54] finalize calculator for release

---
 public/js/calculator.js                |   6 +-
 server/views/partials/footer.jade      |   3 -
 server/views/resources/calculator.jade | 193 +++++++++++++------------
 3 files changed, 104 insertions(+), 98 deletions(-)

diff --git a/public/js/calculator.js b/public/js/calculator.js
index bb92d6a65b..8786b78bea 100644
--- a/public/js/calculator.js
+++ b/public/js/calculator.js
@@ -20,7 +20,7 @@ $(document).ready(function () {
     $(this).addClass('animated pulse');
     setTimeout(function () {
       $('#income').hide();
-      $('#chart').show();
+      $('#chart').addClass('animated fadeIn').show();
       $('#chart-controls').addClass('animated fadeIn').show();
       $('#explanation').addClass('animated fadeIn').show();
     }, 1000);
@@ -28,7 +28,7 @@ $(document).ready(function () {
     $('#chosen').text('Coming from ' + city.replace(/-/g, ' ').replace(/\w\S*/g, function (txt) {
         return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
       }) + ', and making $' + lastYearsIncome.toString().replace(/0000$/, '0,000') + ', your true costs will be:');
-    var categoryNames = ['Opportunity Cost at Current Wage', 'Financing Cost', 'Housing Cost', 'Tuition / Wage Garnishing'];
+    var categoryNames = ['Lost Wages', 'Financing Cost', 'Housing Cost', 'Tuition / Wage Garnishing'];
     bootcamps.forEach(function (camp) {
       var x0 = 0;
       if (camp.cities.indexOf(city) > -1) {
@@ -56,7 +56,7 @@ $(document).ready(function () {
         x1: x0 += weeklyHousing * camp.weeks
       }, {
         name: camp.name,
-        label: 'Opportunity Cost at Current Wage',
+        label: 'Lost Wages',
         value: +(Math.floor(camp.weeks * lastYearsIncome / 50)),
         x0: camp.finance ? +(Math.floor(camp.cost * 1.09519) + weeklyHousing * camp.weeks) : +camp.cost + weeklyHousing * camp.weeks,
         x1: x0 += +(Math.floor(camp.weeks * lastYearsIncome / 50))
diff --git a/server/views/partials/footer.jade b/server/views/partials/footer.jade
index 0af2fce328..fe25c7723a 100644
--- a/server/views/partials/footer.jade
+++ b/server/views/partials/footer.jade
@@ -7,7 +7,6 @@
         a.ion-social-facebook(href="/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city") &nbsp;Facebook&nbsp;&nbsp;
         a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank') &nbsp;Twitter&nbsp;&nbsp;
         a.ion-locked(href="/privacy") &nbsp;Privacy&nbsp;&nbsp;
-        a.ion-android-mail(href="mailto:team@freecodecamp.com") &nbsp;Contact&nbsp;&nbsp;
     .col-xs-12.visible-xs.visible-sm
         a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank')
             span.sr-only Free Code Camp's Blog
@@ -23,5 +22,3 @@
             span.sr-only Free Code Camp on Twitter
         a.ion-locked(href="/privacy")
             span.sr-only Free Code Camp's Privacy Policy
-        a.ion-android-mail(href="mailto:team@freecodecamp.com")
-            span.sr-only Contact Free Code Camp by email
diff --git a/server/views/resources/calculator.jade b/server/views/resources/calculator.jade
index 8ae888041b..5e25352139 100644
--- a/server/views/resources/calculator.jade
+++ b/server/views/resources/calculator.jade
@@ -1,95 +1,104 @@
-extends ../layout
+extends ../layout-wide
 block content
     script(src="../../../js/calculator.js")
-    .panel.panel-info
-        .panel-heading.text-center Coding Bootcamp Cost Calculator
-        .panel-body
-            .row
+    .row
+        .col-xs-12.col-sm-10.col-md-8.col-lg-6.col-sm-offset-1.col-md-offset-2.col-lg-offset-3
+            h3.text-center.text-primary#chosen Coming from _______, and making $_______, your true costs will be:
+            #city-buttons
+                .spacer
+                h2.text-center Where do you live?
+                .spacer
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#atlanta.btn.btn-primary.btn-block.btn-lg Atlanta
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#austin.btn.btn-primary.btn-block.btn-lg Austin
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#brisbane.btn.btn-primary.btn-block.btn-lg Brisbane
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#boulder.btn.btn-primary.btn-block.btn-lg Boulder
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#chicago.btn.btn-primary.btn-block.btn-lg Chicago
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#denver.btn.btn-primary.btn-block.btn-lg Denver
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#hong-kong.btn.btn-primary.btn-block.btn-lg Hong Kong
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#london.btn.btn-primary.btn-block.btn-lg London
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#los-angeles.btn.btn-primary.btn-block.btn-lg Los Angeles
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#manchester.btn.btn-primary.btn-block.btn-lg Manchester
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#melbourne.btn.btn-primary.btn-block.btn-lg Melbourne
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#new-york-city.btn.btn-primary.btn-block.btn-lg New York City
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#portland.btn.btn-primary.btn-block.btn-lg Portland
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#raleigh-durham.btn.btn-primary.btn-block.btn-lg Raleigh-Durham
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#san-francisco.btn.btn-primary.btn-block.btn-lg San Fransisco
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#seattle.btn.btn-primary.btn-block.btn-lg Seattle
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#singapore.btn.btn-primary.btn-block.btn-lg Singapore
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#toronto.btn.btn-primary.btn-block.btn-lg Toronto
+                .col-xs-12.btn-nav
+                    button#other.btn.btn-primary.btn-block.btn-lg Other
+                    .spacer
+            #income.initially-hidden
+                .spacer
+                h2.text-center How much money did you make last year (in USD)?
+                .spacer
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#0.btn.btn-primary.btn-block.btn-lg(href='#') $0
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#20000.btn.btn-primary.btn-block.btn-lg(href='#') $20,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#30000.btn.btn-primary.btn-block.btn-lg(href='#') $30,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#40000.btn.btn-primary.btn-block.btn-lg(href='#') $40,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#50000.btn.btn-primary.btn-block.btn-lg(href='#') $50,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#60000.btn.btn-primary.btn-block.btn-lg(href='#') $60,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#70000.btn.btn-primary.btn-block.btn-lg(href='#') $70,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#80000.btn.btn-primary.btn-block.btn-lg(href='#') $80,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#90000.btn.btn-primary.btn-block.btn-lg(href='#') $90,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#100000.btn.btn-primary.btn-block.btn-lg(href='#') $100,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#120000.btn.btn-primary.btn-block.btn-lg(href='#') $120,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#140000.btn.btn-primary.btn-block.btn-lg(href='#') $140,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#160000.btn.btn-primary.btn-block.btn-lg(href='#') $160,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#180000.btn.btn-primary.btn-block.btn-lg(href='#') $180,000
+                .col-xs-12.col-sm-12.col-md-4.btn-nav
+                    button#200000.btn.btn-primary.btn-block.btn-lg(href='#') $200,000
+                    .spacer
+            #chart.initially-hidden
+                .d3-centered
+                    svg.chart
+            #explanation.initially-hidden
                 .col-xs-12.col-sm-10.col-sm-offset-1
-                    h3.text-primary#chosen Coming from _______, and making $_______, your true costs will be:
-                    #city-buttons
-                        h2 Where do you live?
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#atlanta.btn.btn-primary.btn-block.btn-lg Atlanta
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#austin.btn.btn-primary.btn-block.btn-lg Austin
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#brisbane.btn.btn-primary.btn-block.btn-lg Brisbane
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#boulder.btn.btn-primary.btn-block.btn-lg Boulder
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#chicago.btn.btn-primary.btn-block.btn-lg Chicago
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#denver.btn.btn-primary.btn-block.btn-lg Denver
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#hong-kong.btn.btn-primary.btn-block.btn-lg Hong Kong
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#london.btn.btn-primary.btn-block.btn-lg London
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#los-angeles.btn.btn-primary.btn-block.btn-lg Los Angeles
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#manchester.btn.btn-primary.btn-block.btn-lg Manchester
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#melbourne.btn.btn-primary.btn-block.btn-lg Melbourne
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#new-york-city.btn.btn-primary.btn-block.btn-lg New York City
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#portland.btn.btn-primary.btn-block.btn-lg Portland
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#raleigh-durham.btn.btn-primary.btn-block.btn-lg Raleigh-Durham
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#san-francisco.btn.btn-primary.btn-block.btn-lg San Fransisco
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#seattle.btn.btn-primary.btn-block.btn-lg Seattle
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#singapore.btn.btn-primary.btn-block.btn-lg Singapore
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#toronto.btn.btn-primary.btn-block.btn-lg Toronto
-                        .col-xs-12.btn-nav
-                            button#other.btn.btn-primary.btn-block.btn-lg Other
-                            .spacer
-                    #income.initially-hidden
-                        h2 How much money did you make last year (in USD)?
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#0.btn.btn-primary.btn-block.btn-lg(href='#') $0
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#20000.btn.btn-primary.btn-block.btn-lg(href='#') $20,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#30000.btn.btn-primary.btn-block.btn-lg(href='#') $30,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#40000.btn.btn-primary.btn-block.btn-lg(href='#') $40,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#50000.btn.btn-primary.btn-block.btn-lg(href='#') $50,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#60000.btn.btn-primary.btn-block.btn-lg(href='#') $60,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#70000.btn.btn-primary.btn-block.btn-lg(href='#') $70,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#80000.btn.btn-primary.btn-block.btn-lg(href='#') $80,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#90000.btn.btn-primary.btn-block.btn-lg(href='#') $90,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#100000.btn.btn-primary.btn-block.btn-lg(href='#') $100,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#120000.btn.btn-primary.btn-block.btn-lg(href='#') $120,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#140000.btn.btn-primary.btn-block.btn-lg(href='#') $140,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#160000.btn.btn-primary.btn-block.btn-lg(href='#') $160,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#180000.btn.btn-primary.btn-block.btn-lg(href='#') $180,000
-                        .col-xs-12.col-sm-6.col-md-4.btn-nav
-                            button#200000.btn.btn-primary.btn-block.btn-lg(href='#') $200,000
-                            .spacer
-                    #chart.initially-hidden
-                        .d3-centered
-                            svg.chart
-                    #explanation.initially-hidden
-                        .text-center
-                            .text-center
-                                button#transform.btn.btn-primary.btn-block.btn-lg Transform
-                            .button-spacer
-                            a(href='/coding-bootcamp-cost-calculator.json') View Data Source JSON
-                            span &nbsp; &bullet; &nbsp;
-                            a(href='/coding-bootcamp-cost-calculator') Recalculate
-                        p.large-p Test
+                    .text-center
+                        button#transform.btn.btn-primary.btn-lg Transform
+                        .button-spacer
+                        a(href='/coding-bootcamp-cost-calculator.json') View Data Source JSON
+                        span &nbsp; &bullet; &nbsp;
+                        a(href='/coding-bootcamp-cost-calculator') Recalculate
+                    h3 Notes:
+                    ol
+                        li.large-li For cash-up-front bootcamps, we assumed an APR of 6% and a term of 3 years.
+                        li.large-li For wage-garnishing bootcamps, we assume 18% of first year wages at their advertised starting annual salary of around $100,000.
+                        li.large-li We assume a cost of living of $500 for cities like San Francisco and New York City, and $400 per week for everywhere else.
+                        li.large-li The most substantial cost for most people is lost wages. A 40-hour-per-week job at the US Federal minimum wage would pay at least $15,000 per year. You can read more about economic cost
+                            a(href='https://en.wikipedia.org/wiki/Economic_cost' target='_blank')  here
+                            | .
+                        li.large-li Free Code Camp. We don't charge tuition or garnish wages. We're fully online so you don't have to move. We're self-paced so you don't have to quit your job. Thus, your true cost of attending Free Code Camp will be $0.

From a788d2954d1805d4601155b44198172d2a8d9b7b Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 16 Jun 2015 14:53:18 -0700
Subject: [PATCH 22/54] add hacked loopback version this version avoids cheking
 indexOf on falsey values

---
 gulpfile.js  | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 46c6cbd82d..e5cd405528 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -78,6 +78,8 @@ gulp.task('less', function() {
     .pipe(gulp.dest('./public/css/'));
 });
 
+gulp.task('build', ['less']);
+
 gulp.task('watch', ['less', 'serve', 'sync'], function() {
   gulp.watch('./public/css/*.less', ['less']);
 });
diff --git a/package.json b/package.json
index 97277d8279..d156bb0873 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "less": "~1.7.5",
     "less-middleware": "~2.0.1",
     "lodash": "^3.9.3",
-    "loopback": "^2.18.0",
+    "loopback": "https://github.com/FreeCodeCamp/loopback.git#fix/no-password",
     "loopback-boot": "^2.8.0",
     "loopback-component-passport": "git://github.com/FreeCodeCamp/loopback-component-passport.git#feature/emailOptional",
     "loopback-connector-mongodb": "^1.10.0",

From 0ceb5e0685a1e39da63c492976d7e7109af8dd5e Mon Sep 17 00:00:00 2001
From: Andrew Cay <Lemony-Andrew@users.noreply.github.com>
Date: Tue, 16 Jun 2015 16:52:32 -0700
Subject: [PATCH 23/54] Inserted reset button with button spacer below Run

---
 views/coursewares/showBonfire.jade | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/coursewares/showBonfire.jade b/views/coursewares/showBonfire.jade
index 4270e5975a..1b84856e43 100644
--- a/views/coursewares/showBonfire.jade
+++ b/views/coursewares/showBonfire.jade
@@ -90,7 +90,10 @@ block content
                                 alert(type='danger')
                                     span.ion-close-circled
                                     | Username not found
-                #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
+				#submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
+				.button-spacer
+				#resetButton.btn.btn-danger.btn-big.btn-block(data-toggle='modal', data-target='#reset-modal', data-backdrop='true')
+					  | Reset Code
                 if (user && user.sentSlackInvite)
                     .button-spacer
                     .btn-group.input-group.btn-group-justified

From 687750809f0c1fad5d66f4a202440dc1205027b2 Mon Sep 17 00:00:00 2001
From: Andrew Cay <Lemony-Andrew@users.noreply.github.com>
Date: Tue, 16 Jun 2015 16:56:50 -0700
Subject: [PATCH 24/54] Reset button inserted beneath Run

Also inserted a button spacer in appropriate place.
---
 views/coursewares/showBonfire.jade | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/coursewares/showBonfire.jade b/views/coursewares/showBonfire.jade
index 1b84856e43..4fd79ffc88 100644
--- a/views/coursewares/showBonfire.jade
+++ b/views/coursewares/showBonfire.jade
@@ -90,10 +90,10 @@ block content
                                 alert(type='danger')
                                     span.ion-close-circled
                                     | Username not found
-				#submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
-				.button-spacer
-				#resetButton.btn.btn-danger.btn-big.btn-block(data-toggle='modal', data-target='#reset-modal', data-backdrop='true')
-					  | Reset Code
+		#submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
+		.button-spacer
+		#resetButton.btn.btn-danger.btn-big.btn-block(data-toggle='modal', data-target='#reset-modal', data-backdrop='true')
+			  | Reset Code
                 if (user && user.sentSlackInvite)
                     .button-spacer
                     .btn-group.input-group.btn-group-justified

From d615e94c29c0f8ae328a44d285883476d40a895b Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Tue, 16 Jun 2015 18:00:17 -0700
Subject: [PATCH 25/54] fix minor typo in html challenge

---
 seed/challenges/basic-html5-and-css.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/challenges/basic-html5-and-css.json b/seed/challenges/basic-html5-and-css.json
index 4640facb09..4a8df44a71 100644
--- a/seed/challenges/basic-html5-and-css.json
+++ b/seed/challenges/basic-html5-and-css.json
@@ -831,7 +831,7 @@
         "assert($('img').hasClass('thick-green-border'), 'Your <code>img</code> element should have the class \"thick-green-border\".')",
         "assert($('img').hasClass('thick-green-border') && parseInt($('img').css('border-top-width')), 'Give your image a border width of 10px.')",
         "assert(new RegExp('solid', 'gi').test(editor), 'Give your image a border style of \"solid\".')",
-        "assert($('img').css('border-left-color') === 'rgb(0, 128, 0)', 'Your <code>img</code> element should be green.')"
+        "assert($('img').css('border-left-color') === 'rgb(0, 128, 0)', 'The border around your <code>img</code> element should be green.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",

From 63641a141b72d40827987ab5a4c10b5298201f8d Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Wed, 17 Jun 2015 12:43:30 -0400
Subject: [PATCH 26/54] Update .gitignore to ignore .remote-sync.json file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 112d64591e..60d9092f91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ bower_components
 main.css
 bundle.js
 coverage
+.remote-sync.json

From b88f862cd6f379919bd4b998ccae132b60210620 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Wed, 17 Jun 2015 13:25:34 -0400
Subject: [PATCH 27/54] Update readme

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0a7e0e9151..9770de3ebc 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,9 @@ Welcome to Free Code Camp's open source codebase!
 =======================
 
 #Note
-We're currently very close to moving from express to loopback. As such, please keep in mind that the instructions here for setting up and running the project do not directly translate to the staging branch. Additionally, the file structure is quite a bit different. As always, the staging branch is the appropriate place to branch off of to fix/add something!
+We're currently very close to moving from Express to Loopback. As such, please keep in mind that the instructions here for setting up and running the project do not directly translate to the staging branch. Additionally, the file structure is quite a bit different. As always, the staging branch is the appropriate place to branch off of to fix/add something!
 
-Free Code Camp is an open-source community of busy people who learn to code, then build projects for nonprofits. 
+Free Code Camp is an open-source community of busy people who learn to code, then build projects for nonprofits.
 
 Our campers (students) start by working through our free, self-paced, browser-based curriculum. Next, they build several practice projects. Finally, we pair two campers together with a stakeholder from a nonprofit organization, and help them build the solution the nonprofit has requested.
 
@@ -17,7 +17,7 @@ Our campers (students) start by working through our free, self-paced, browser-ba
 
 80% of our campers are over 25, and nearly a fifth of our campers are women.
 
-This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Slack](http://freecodecamp.slack.com), a [blog](http://blog.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp). 
+This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Slack](http://freecodecamp.slack.com), a [blog](http://blog.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp).
 
 [Join our community](http://www.freecodecamp.com/signin)!
 
@@ -28,7 +28,7 @@ We welcome pull requests from Free Code Camp campers (our students) and seasoned
 
 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 [Slack](http://freecodecamp.slack.com).
-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. 
+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.

From fbb7d0b06552c4cd9e137dd1283b41e817b99d80 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Wed, 17 Jun 2015 15:40:44 -0400
Subject: [PATCH 28/54] Remove ssl on node servers

---
 server/server.js | 67 +++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/server/server.js b/server/server.js
index cc69e11ae3..343e417b44 100755
--- a/server/server.js
+++ b/server/server.js
@@ -2,9 +2,7 @@ require('dotenv').load();
 require('pmx').init();
 // handle uncaught exceptions. Forever will restart process on shutdown
 
-var https = require('https'),
-  sslConfig = require('./ssl-config'),
-  R = require('ramda'),
+var R = require('ramda'),
   assign = require('lodash').assign,
   loopback = require('loopback'),
   boot = require('loopback-boot'),
@@ -54,10 +52,12 @@ app.use(compress());
 app.use(lessMiddleware(path.join(__dirname, '/public')));
 app.use(logger('dev'));
 app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: true }));
+app.use(bodyParser.urlencoded({
+  extended: true
+}));
 app.use(expressValidator({
   customValidators: {
-    matchRegex: function (param, regex) {
+    matchRegex: function(param, regex) {
       return regex.test(param);
     }
   }
@@ -145,8 +145,7 @@ app.use(helmet.csp({
     'https://cdn.inspectlet.com/inspectlet.js',
     'http://cdn.inspectlet.com/inspectlet.js'
   ].concat(trusted),
-  'connect-src': [
-  ].concat(trusted),
+  'connect-src': [].concat(trusted),
   styleSrc: [
     '*.googleapis.com',
     '*.gstatic.com'
@@ -180,14 +179,16 @@ app.use(helmet.csp({
 
 passportConfigurator.init();
 
-app.use(function (req, res, next) {
+app.use(function(req, res, next) {
   // Make user object available in templates.
   res.locals.user = req.user;
   next();
 });
 
 app.use(
-  loopback.static(path.join(__dirname, '../public'), { maxAge: 86400000 })
+  loopback.static(path.join(__dirname, '../public'), {
+    maxAge: 86400000
+  })
 );
 
 boot(app, {
@@ -195,7 +196,7 @@ boot(app, {
   dev: process.env.NODE_ENV
 });
 
-app.use(function (req, res, next) {
+app.use(function(req, res, next) {
   // Remember original destination before login.
   var path = req.path.split('/')[1];
   if (/auth|login|logout|signin|signup|fonts|favicon/i.test(path)) {
@@ -224,7 +225,8 @@ var passportOptions = {
       null;
 
     var username = (profile.username || profile.id);
-    username = typeof username === 'string' ? username.toLowerCase() : username;
+    username = typeof username === 'string' ? username.toLowerCase() :
+      username;
     var password = generateKey('password');
     var userObj = {
       username: username,
@@ -256,7 +258,9 @@ R.keys(passportProviders).map(function(strategy) {
  */
 
 if (process.env.NODE_ENV === 'development') {
-  app.use(errorHandler({ log: true }));
+  app.use(errorHandler({
+    log: true
+  }));
 } else {
   app.use(pmx.expressErrorHandler());
   // error handling in production disabling eslint due to express parity rules
@@ -279,12 +283,16 @@ if (process.env.NODE_ENV === 'development') {
 
     var message = 'opps! Something went wrong. Please try again later';
     if (type === 'html') {
-      req.flash('errors', { msg: message });
+      req.flash('errors', {
+        msg: message
+      });
       return res.redirect('/');
       // json
     } else if (type === 'json') {
       res.setHeader('Content-Type', 'application/json');
-      return res.send({ message: message });
+      return res.send({
+        message: message
+      });
       // plain text
     } else {
       res.setHeader('Content-Type', 'text/plain');
@@ -297,31 +305,14 @@ if (process.env.NODE_ENV === 'development') {
  * Start Express server.
  */
 
-var options = {
-  key: sslConfig.privateKey,
-  cert: sslConfig.certificate
-};
 
-if (process.env.NODE_ENV === 'production') {
-  var server = https.createServer(options, app);
-  console.log('https://' + process.env.HOST + ':' + process.env.PORT);
-  server.listen(app.get('port'), function () {
-    console.log(
-      'FreeCodeCamp server listening on port %d in %s mode',
-      app.get('port'),
-      app.get('env')
-    );
-    app.emit('started', 'https://' + process.env.HOST + ':' + app.get('port'));
-  });
-} else {
-  app.listen(app.get('port'), function () {
-    console.log(
-      'FreeCodeCamp server listening on port %d in %s mode',
-      app.get('port'),
-      app.get('env')
-    );
-  });
-}
+app.listen(app.get('port'), function() {
+  console.log(
+    'FreeCodeCamp server listening on port %d in %s mode',
+    app.get('port'),
+    app.get('env')
+  );
+});
 
 // start the server if `$ node server.js`
 

From d1a12fc8944b825d9effc9cc2932ab2db212708b Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Wed, 17 Jun 2015 23:30:08 +0200
Subject: [PATCH 29/54] 'No repeats please' test fix. #941

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

diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index e14504dba4..978ebe81ce 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -230,7 +230,7 @@
         "permAlone('aab');"
       ],
       "tests": [
-        "expect(permAlone('aab')).to.be.a.number;",
+        "expect(permAlone('aab')).to.be.a('number');",
         "expect(permAlone('aab')).to.equal(2);",
         "expect(permAlone('aaa')).to.equal(0);",
         "expect(permAlone('aabb')).to.equal(8);",

From bb6f1538588af279fddb608b0882aa09c50441da Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 17 Jun 2015 20:26:59 -0700
Subject: [PATCH 30/54] make server always show stack traces upon error

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

diff --git a/server/server.js b/server/server.js
index 343e417b44..9d4734443d 100755
--- a/server/server.js
+++ b/server/server.js
@@ -257,7 +257,8 @@ R.keys(passportProviders).map(function(strategy) {
  * 500 Error Handler.
  */
 
-if (process.env.NODE_ENV === 'development') {
+//if (process.env.NODE_ENV === 'development') {
+if (true) {
   app.use(errorHandler({
     log: true
   }));

From bfddc0330f8200158c4e09b3369bc5f8563597f4 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 17 Jun 2015 20:59:35 -0700
Subject: [PATCH 31/54] add state attribute to linked oauth note: a new
 variable will need to be added to .env 'LINKEDIN_STATE' which is a random
 string

---
 server/passport-providers.js | 6 ++++++
 server/server.js             | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/passport-providers.js b/server/passport-providers.js
index 3c779a162e..907b4c849a 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -104,6 +104,9 @@ module.exports = {
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_fullprofile', 'r_emailaddress'],
+    oAuthOptions: {
+      state: process.ENV.LINKED_STATE
+    },
     failureFlash: true
   },
   'linkedin-link': {
@@ -118,6 +121,9 @@ module.exports = {
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_fullprofile', 'r_emailaddress'],
+    authOptions: {
+      state: process.ENV.LINKED_STATE
+    },
     failureFlash: true
   }
 };
diff --git a/server/server.js b/server/server.js
index 9d4734443d..27ec95b289 100755
--- a/server/server.js
+++ b/server/server.js
@@ -257,8 +257,8 @@ R.keys(passportProviders).map(function(strategy) {
  * 500 Error Handler.
  */
 
-//if (process.env.NODE_ENV === 'development') {
-if (true) {
+// if (process.env.NODE_ENV === 'development') {
+if (true) { // eslint-disable-line
   app.use(errorHandler({
     log: true
   }));

From a8540bee35d561adeb5daa9c88dcf8553335dc0c Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 17 Jun 2015 21:04:28 -0700
Subject: [PATCH 32/54] add initial react app

---
 client/README.md                              |   3 +
 client/index.js                               |  20 ++++
 common/app/App.jsx                            |  25 +++++
 common/app/appFactory.jsx                     |  18 +++
 common/app/components/Footer/Footer.jsx       |  50 +++++++++
 common/app/components/Footer/index.js         |   1 +
 common/app/components/Footer/links.json       |  44 ++++++++
 .../nav => app/components/Nav}/Nav.jsx        |  55 +++++----
 .../nav => app/components/Nav}/NavItem.jsx    |   0
 common/app/components/Nav/index.js            |   1 +
 common/app/components/README.md               |   1 +
 common/app/routes/Admin/README.md             |   1 +
 .../routes/Bonfires}/Actions.js               |   0
 common/app/routes/Bonfires/README.md          |   1 +
 .../bonfires => app/routes/Bonfires}/Store.js |   0
 .../routes/Bonfires/components}/Bonfires.jsx  |   0
 .../routes/Bonfires/components}/Results.jsx   |   0
 .../routes/Bonfires/components}/SidePanel.jsx |   0
 .../routes/Bonfires}/executeBonfire.js        |   0
 common/app/routes/Bonfires/index.js           |   6 +
 common/app/routes/FAVS/README.md              |   1 +
 common/app/routes/Jobs/README.md              |   1 +
 common/app/routes/Jobs/components/Actions.js  |  15 +++
 common/app/routes/Jobs/components/Jobs.jsx    |  28 +++++
 common/app/routes/Jobs/components/List.jsx    |  13 +++
 common/app/routes/Jobs/components/Store.js    |   9 ++
 common/app/routes/Jobs/index.js               |  19 ++++
 common/app/routes/index.js                    |  11 ++
 common/app/shared/README.md                   |   1 +
 .../shared}/displayCode/Display.jsx           |   0
 .../shared}/displayCode/index.js              |   0
 .../{screens => app/shared}/editor/Editor.jsx |   0
 .../{screens => app/shared}/editor/index.js   |   0
 common/screens/App.jsx                        |  19 ----
 common/screens/Router.jsx                     |  34 ------
 common/screens/bonfires/index.js              |   1 -
 common/screens/context/Actions.js             |  34 ------
 common/screens/context/Store.js               |  18 ---
 common/screens/footer/Footer.jsx              | 106 ------------------
 common/screens/footer/index.js                |   1 -
 common/screens/nav/index.js                   |   1 -
 package.json                                  |   5 +-
 42 files changed, 299 insertions(+), 244 deletions(-)
 create mode 100644 client/README.md
 create mode 100644 client/index.js
 create mode 100644 common/app/App.jsx
 create mode 100644 common/app/appFactory.jsx
 create mode 100644 common/app/components/Footer/Footer.jsx
 create mode 100644 common/app/components/Footer/index.js
 create mode 100644 common/app/components/Footer/links.json
 rename common/{screens/nav => app/components/Nav}/Nav.jsx (56%)
 rename common/{screens/nav => app/components/Nav}/NavItem.jsx (100%)
 create mode 100644 common/app/components/Nav/index.js
 create mode 100644 common/app/components/README.md
 create mode 100644 common/app/routes/Admin/README.md
 rename common/{screens/bonfires => app/routes/Bonfires}/Actions.js (100%)
 create mode 100644 common/app/routes/Bonfires/README.md
 rename common/{screens/bonfires => app/routes/Bonfires}/Store.js (100%)
 rename common/{screens/bonfires => app/routes/Bonfires/components}/Bonfires.jsx (100%)
 rename common/{screens/bonfires => app/routes/Bonfires/components}/Results.jsx (100%)
 rename common/{screens/bonfires => app/routes/Bonfires/components}/SidePanel.jsx (100%)
 rename common/{screens/bonfires => app/routes/Bonfires}/executeBonfire.js (100%)
 create mode 100644 common/app/routes/Bonfires/index.js
 create mode 100644 common/app/routes/FAVS/README.md
 create mode 100644 common/app/routes/Jobs/README.md
 create mode 100644 common/app/routes/Jobs/components/Actions.js
 create mode 100644 common/app/routes/Jobs/components/Jobs.jsx
 create mode 100644 common/app/routes/Jobs/components/List.jsx
 create mode 100644 common/app/routes/Jobs/components/Store.js
 create mode 100644 common/app/routes/Jobs/index.js
 create mode 100644 common/app/routes/index.js
 create mode 100644 common/app/shared/README.md
 rename common/{screens => app/shared}/displayCode/Display.jsx (100%)
 rename common/{screens => app/shared}/displayCode/index.js (100%)
 rename common/{screens => app/shared}/editor/Editor.jsx (100%)
 rename common/{screens => app/shared}/editor/index.js (100%)
 delete mode 100644 common/screens/App.jsx
 delete mode 100644 common/screens/Router.jsx
 delete mode 100644 common/screens/bonfires/index.js
 delete mode 100644 common/screens/context/Actions.js
 delete mode 100644 common/screens/context/Store.js
 delete mode 100644 common/screens/footer/Footer.jsx
 delete mode 100644 common/screens/footer/index.js
 delete mode 100644 common/screens/nav/index.js

diff --git a/client/README.md b/client/README.md
new file mode 100644
index 0000000000..b75516ce38
--- /dev/null
+++ b/client/README.md
@@ -0,0 +1,3 @@
+This is the entry point for the client
+Code that should only run on the client should be put here.
+NOTE(berks): For react specific stuff this should be the entry point
diff --git a/client/index.js b/client/index.js
new file mode 100644
index 0000000000..68baa7ec0a
--- /dev/null
+++ b/client/index.js
@@ -0,0 +1,20 @@
+import BrowserHistory from 'react-router/lib/BrowserHistory';
+import debugFactory from 'debug';
+import { Cat } from 'thundercats';
+
+import AppFactory from '../common/app/appFactory';
+
+const debug = debugFactory('fcc:client');
+const DOMContianer = document.getElemenetById('#fCC');
+const fcc = new Cat();
+
+// returns an observable
+fcc.render(AppFactory(BrowserHistory), DOMContianer)
+  .subscribe(
+    function() {
+      debug('react rendered');
+    },
+    function(err) {
+      debug('an error has occured', err.stack);
+    }
+  );
diff --git a/common/app/App.jsx b/common/app/App.jsx
new file mode 100644
index 0000000000..f3a77cae51
--- /dev/null
+++ b/common/app/App.jsx
@@ -0,0 +1,25 @@
+import React, { PropTypes } from 'react';
+
+import Nav from './components/Nav';
+import Footer from './components/Footer';
+
+export default class extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+  static displayName = 'FreeCodeCamp'
+  static propTypes = {
+    children: PropTypes.node
+  }
+
+  render() {
+    return (
+      <div>
+        <Nav />
+        { this.props.children }
+        <Footer />
+      </div>
+    );
+  }
+}
diff --git a/common/app/appFactory.jsx b/common/app/appFactory.jsx
new file mode 100644
index 0000000000..b8732a89c6
--- /dev/null
+++ b/common/app/appFactory.jsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { Router, Route } from 'react-router';
+
+// components
+import App from './App.jsx';
+import Jobs from './screens/App/screens/Jobs';
+
+module.exports = function appFactory(history) {
+  return (
+    <Router history={ history }>
+      <Route handler={ App }>
+        <Route
+          component={ Jobs }
+          path='/jobs' />
+      </Route>
+    </Router>
+  );
+};
diff --git a/common/app/components/Footer/Footer.jsx b/common/app/components/Footer/Footer.jsx
new file mode 100644
index 0000000000..f95e0e3adc
--- /dev/null
+++ b/common/app/components/Footer/Footer.jsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { Col, Row, Grid } from 'react-bootstrap';
+
+import links from './links.json';
+
+export default class extends React.Component {
+  static displayName = 'Footer'
+  renderLinks(mobile) {
+    return links.map(link => {
+      return (
+        <a
+          className={ link.className}
+          href={ link.href }
+          target={ link.target }>
+          { this.renderContent(mobile, link.content) }
+        </a>
+      );
+    });
+  }
+
+  renderContent(mobile, content) {
+    if (mobile) {
+      return (
+        <span className='sr-only'>
+          content;
+        </span>
+      );
+    }
+    return content;
+  }
+
+  render() {
+    return (
+      <Grid className='fcc-footer'>
+        <Row>
+          <Col
+            className='hidden-xs hidden-sm'
+            xs={ 12 }>
+            { this.renderLinks() }
+          </Col>
+          <Col
+            className='visible-xs visible-sm'
+            xs={ 12 }>
+            { this.renderLinks(true) }
+          </Col>
+        </Row>
+      </Grid>
+    );
+  }
+}
diff --git a/common/app/components/Footer/index.js b/common/app/components/Footer/index.js
new file mode 100644
index 0000000000..c50e0cda87
--- /dev/null
+++ b/common/app/components/Footer/index.js
@@ -0,0 +1 @@
+export { default as Footer } from './Footer.jsx';
diff --git a/common/app/components/Footer/links.json b/common/app/components/Footer/links.json
new file mode 100644
index 0000000000..54071917b4
--- /dev/null
+++ b/common/app/components/Footer/links.json
@@ -0,0 +1,44 @@
+[
+  {
+    "className": "ion-speakerphone",
+    "content": "&nbsp;Blog&nbsp;&nbsp;",
+    "href": "http://blog.freecodecamp.com",
+    "target": "_blank"
+  },
+  {
+    "className": "ion-social-twitch-outline",
+    "content": "&nbsp;Twitch&nbsp;&nbsp;",
+    "href": "http://www.twitch.tv/freecodecamp",
+    "target": "_blank"
+  },
+  {
+    "className": "ion-social-github",
+    "content": "&nbsp;Github&nbsp;&nbsp;",
+    "href": "http://github.com/freecodecamp",
+    "target": "_blank"
+  },
+  {
+    "className": "ion-social-twitter",
+    "content": "&nbsp;Twitter&nbsp;&nbsp;",
+    "href": "http://twitter.com/freecodecamp",
+    "target": "_blank"
+  },
+  {
+    "className": "ion-social-facebook",
+    "content": "&nbsp;Facebook&nbsp;&nbsp;",
+    "href": "http://facebook.com/freecodecamp",
+    "target": "_blank"
+  },
+  {
+    "className": "ion-information-circled",
+    "content": "&nbsp;About&nbsp;&nbsp;",
+    "href": "/learn-to-code",
+    "target": "_self"
+  },
+  {
+    "className": "ion-locked",
+    "content": "&nbsp;Privacy&nbsp;&nbsp;",
+    "href": "/privacy'",
+    "target": "_self"
+  }
+]
diff --git a/common/screens/nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
similarity index 56%
rename from common/screens/nav/Nav.jsx
rename to common/app/components/Nav/Nav.jsx
index 52a9a8728b..f5c339c2c1 100644
--- a/common/screens/nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -1,31 +1,30 @@
-var React = require('react'),
-    bootStrap = require('react-bootstrap'),
-    Navbar = bootStrap.Navbar,
-    Nav = bootStrap.Nav,
-    NavItem = bootStrap.NavItem,
-    NavItemFCC = require('./NavItem.jsx');
+import React from 'react';
+import { Nav, Navbar, NavItem } from 'react-bootstrap';
+import NavItemFCC from './NavItem.jsx';
 
-var NavBarComp = React.createClass({
+export default class extends React.Component {
+  constructor(props) {
+    super(props);
+  }
 
-  propTypes: { signedIn: React.PropTypes.bool },
+  static displayName = 'Nav'
+  static propTypes = {
+    signedIn: React.PropTypes.bool
+  }
 
-  getDefaultProps: function() {
-    return { signedIn: false };
-  },
-
-  _renderBrand: function() {
+  renderBrand() {
     var fCClogo = 'https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg';
     return (
       <a href='/'>
         <img
-          src={ fCClogo }
           alt='learn to code javascript at Free Code Camp logo'
-          className='img-responsive nav-logo' />
+          className='img-responsive nav-logo'
+          src={ fCClogo } />
       </a>
     );
-  },
+  }
 
-  _renderSignin: function() {
+  renderSignin() {
     if (this.props.signedIn) {
       return (
         <NavItem
@@ -36,27 +35,26 @@ var NavBarComp = React.createClass({
     } else {
       return (
         <NavItemFCC
+          aClassName='btn signup-btn signup-btn-nav'
           eventKey={ 2 }
-          href='/login'
-          aClassName='btn signup-btn signup-btn-nav'>
-            Sign In
+          href='/login'>
+          Sign In
         </NavItemFCC>
       );
     }
-  },
-
-  render: function() {
+  }
 
+  render() {
     return (
       <Navbar
         brand={ this._renderBrand() }
+        className='nav-height'
         fixedTop={ true }
-        toggleNavKey={ 0 }
-        className='nav-height'>
+        toggleNavKey={ 0 }>
         <Nav
-          right={ true }
+          className='hamburger-dropdown'
           eventKey={ 0 }
-          className='hamburger-dropdown'>
+          right={ true }>
           <NavItem
             eventKey={ 1 }
             href='/Challenges'>
@@ -77,5 +75,4 @@ var NavBarComp = React.createClass({
       </Navbar>
     );
   }
-});
-module.exports = NavBarComp;
+}
diff --git a/common/screens/nav/NavItem.jsx b/common/app/components/Nav/NavItem.jsx
similarity index 100%
rename from common/screens/nav/NavItem.jsx
rename to common/app/components/Nav/NavItem.jsx
diff --git a/common/app/components/Nav/index.js b/common/app/components/Nav/index.js
new file mode 100644
index 0000000000..d04d01f62d
--- /dev/null
+++ b/common/app/components/Nav/index.js
@@ -0,0 +1 @@
+export { default as Nav } from './Nav.jsx';
diff --git a/common/app/components/README.md b/common/app/components/README.md
new file mode 100644
index 0000000000..e5b2bbdca3
--- /dev/null
+++ b/common/app/components/README.md
@@ -0,0 +1 @@
+things like NavBar and Footer go here
diff --git a/common/app/routes/Admin/README.md b/common/app/routes/Admin/README.md
new file mode 100644
index 0000000000..7d48e2a6bd
--- /dev/null
+++ b/common/app/routes/Admin/README.md
@@ -0,0 +1 @@
+in case we ever want an admin panel
diff --git a/common/screens/bonfires/Actions.js b/common/app/routes/Bonfires/Actions.js
similarity index 100%
rename from common/screens/bonfires/Actions.js
rename to common/app/routes/Bonfires/Actions.js
diff --git a/common/app/routes/Bonfires/README.md b/common/app/routes/Bonfires/README.md
new file mode 100644
index 0000000000..d28c45c44e
--- /dev/null
+++ b/common/app/routes/Bonfires/README.md
@@ -0,0 +1 @@
+This folder contains things relative to the bonfires screens
diff --git a/common/screens/bonfires/Store.js b/common/app/routes/Bonfires/Store.js
similarity index 100%
rename from common/screens/bonfires/Store.js
rename to common/app/routes/Bonfires/Store.js
diff --git a/common/screens/bonfires/Bonfires.jsx b/common/app/routes/Bonfires/components/Bonfires.jsx
similarity index 100%
rename from common/screens/bonfires/Bonfires.jsx
rename to common/app/routes/Bonfires/components/Bonfires.jsx
diff --git a/common/screens/bonfires/Results.jsx b/common/app/routes/Bonfires/components/Results.jsx
similarity index 100%
rename from common/screens/bonfires/Results.jsx
rename to common/app/routes/Bonfires/components/Results.jsx
diff --git a/common/screens/bonfires/SidePanel.jsx b/common/app/routes/Bonfires/components/SidePanel.jsx
similarity index 100%
rename from common/screens/bonfires/SidePanel.jsx
rename to common/app/routes/Bonfires/components/SidePanel.jsx
diff --git a/common/screens/bonfires/executeBonfire.js b/common/app/routes/Bonfires/executeBonfire.js
similarity index 100%
rename from common/screens/bonfires/executeBonfire.js
rename to common/app/routes/Bonfires/executeBonfire.js
diff --git a/common/app/routes/Bonfires/index.js b/common/app/routes/Bonfires/index.js
new file mode 100644
index 0000000000..edcb26c104
--- /dev/null
+++ b/common/app/routes/Bonfires/index.js
@@ -0,0 +1,6 @@
+export default {
+  path: 'bonfires/(:bonfireName)',
+  getComponents(cb) {
+    // TODO(berks): add bonfire component
+  }
+};
diff --git a/common/app/routes/FAVS/README.md b/common/app/routes/FAVS/README.md
new file mode 100644
index 0000000000..c02922da56
--- /dev/null
+++ b/common/app/routes/FAVS/README.md
@@ -0,0 +1 @@
+future home of FAVS app
diff --git a/common/app/routes/Jobs/README.md b/common/app/routes/Jobs/README.md
new file mode 100644
index 0000000000..5dde417dab
--- /dev/null
+++ b/common/app/routes/Jobs/README.md
@@ -0,0 +1 @@
+This folder contains everything relative to Jobs board
diff --git a/common/app/routes/Jobs/components/Actions.js b/common/app/routes/Jobs/components/Actions.js
new file mode 100644
index 0000000000..b590678e30
--- /dev/null
+++ b/common/app/routes/Jobs/components/Actions.js
@@ -0,0 +1,15 @@
+import { Actions } from 'thundercats';
+
+export default class JobsActions extends Actions {
+  constructor() {
+    super();
+  }
+  static displayName = 'JobsActions'
+
+  getJob(id) {
+    return { id };
+  }
+  getJobs(params) {
+    return { params };
+  }
+}
diff --git a/common/app/routes/Jobs/components/Jobs.jsx b/common/app/routes/Jobs/components/Jobs.jsx
new file mode 100644
index 0000000000..4725abc09c
--- /dev/null
+++ b/common/app/routes/Jobs/components/Jobs.jsx
@@ -0,0 +1,28 @@
+import React, { PropTypes } from 'react';
+import { createContainer } from 'thundercats';
+import { Grid, Row } from 'react-bootstrap';
+
+@createContainer({
+  store: 'JobsStore'
+})
+export default class extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+
+  static displayName = 'Jobs'
+  static propTypes = {
+    jobs: PropTypes.array
+  }
+
+  render() {
+    return (
+      <Grid>
+        <Row>
+          foo
+        </Row>
+      </Grid>
+    );
+  }
+}
diff --git a/common/app/routes/Jobs/components/List.jsx b/common/app/routes/Jobs/components/List.jsx
new file mode 100644
index 0000000000..7eccffbe05
--- /dev/null
+++ b/common/app/routes/Jobs/components/List.jsx
@@ -0,0 +1,13 @@
+import React, { PropTypes } from 'react';
+
+export default class extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+  static displayName = 'JobsList'
+  static propTypes = {}
+  render() {
+    return null;
+  }
+}
diff --git a/common/app/routes/Jobs/components/Store.js b/common/app/routes/Jobs/components/Store.js
new file mode 100644
index 0000000000..6c022f4773
--- /dev/null
+++ b/common/app/routes/Jobs/components/Store.js
@@ -0,0 +1,9 @@
+import { Store } from 'thundercats';
+
+export default class JobsStore extends Store {
+  constructor(cat) {
+    super();
+    let JobsActions = cat.getActions('JobsActions');
+  }
+  static displayName = 'JobsStore'
+}
diff --git a/common/app/routes/Jobs/index.js b/common/app/routes/Jobs/index.js
new file mode 100644
index 0000000000..44813f34f6
--- /dev/null
+++ b/common/app/routes/Jobs/index.js
@@ -0,0 +1,19 @@
+/*
+ *  show: /jobs
+ *  showOne: /jobs/:id
+ *  edit /jobs/:id
+ *  delete /jobs/:id
+ *  createOne /jobs/new
+ */
+
+export default {
+  path: '/jobs/(:jobId)',
+
+  getComponents(cb) {
+    require.ensure([], require => {
+      cb(null, [
+        require('./components/Jobs')
+      ]);
+    });
+  }
+};
diff --git a/common/app/routes/index.js b/common/app/routes/index.js
new file mode 100644
index 0000000000..6e67b86742
--- /dev/null
+++ b/common/app/routes/index.js
@@ -0,0 +1,11 @@
+export default {
+  path: '/',
+  getRoutes(cb) {
+    require.ensure([], require => {
+      cb(null, [
+        // require('./Bonfires'),
+        require('./Jobs')
+      ]);
+    });
+  }
+};
diff --git a/common/app/shared/README.md b/common/app/shared/README.md
new file mode 100644
index 0000000000..afddf4a4ce
--- /dev/null
+++ b/common/app/shared/README.md
@@ -0,0 +1 @@
+Here is where all components that are shared between multiple views
diff --git a/common/screens/displayCode/Display.jsx b/common/app/shared/displayCode/Display.jsx
similarity index 100%
rename from common/screens/displayCode/Display.jsx
rename to common/app/shared/displayCode/Display.jsx
diff --git a/common/screens/displayCode/index.js b/common/app/shared/displayCode/index.js
similarity index 100%
rename from common/screens/displayCode/index.js
rename to common/app/shared/displayCode/index.js
diff --git a/common/screens/editor/Editor.jsx b/common/app/shared/editor/Editor.jsx
similarity index 100%
rename from common/screens/editor/Editor.jsx
rename to common/app/shared/editor/Editor.jsx
diff --git a/common/screens/editor/index.js b/common/app/shared/editor/index.js
similarity index 100%
rename from common/screens/editor/index.js
rename to common/app/shared/editor/index.js
diff --git a/common/screens/App.jsx b/common/screens/App.jsx
deleted file mode 100644
index a0756abc14..0000000000
--- a/common/screens/App.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-var React = require('react'),
-    RouteHandler = require('react-router').RouteHandler,
-
-    // ## components
-    Nav = require('./nav'),
-    Footer = require('./footer');
-
-var App = React.createClass({
-  render: function() {
-    return (
-      <div>
-        <Nav />
-        <RouteHandler />
-        <Footer />
-      </div>
-    );
-  }
-});
-module.exports = App;
diff --git a/common/screens/Router.jsx b/common/screens/Router.jsx
deleted file mode 100644
index 650c4107ad..0000000000
--- a/common/screens/Router.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-var React = require('react'),
-
-    // react router
-    Router = require('react-router'),
-    Route = Router.Route,
-    // NotFound = Router.NotFoundRoute,
-    DefaultRoute = Router.DefaultRoute,
-
-    // # Components
-    App = require('./App.jsx'),
-    Bonfires = require('./bonfires');
-
-var routes = (
-  <Route
-    name='app'
-    path='/'
-    handler={ App }>
-
-    <Route
-      name='bonfires'
-      path='/bonfires/?:bonfireName?'
-      handler={ Bonfires } />
-
-    <DefaultRoute
-      handler={ Bonfires } />
-  </Route>
-);
-
-module.exports = function(Location) {
-  return Router.create({
-    routes: routes,
-    location: Location
-  });
-};
diff --git a/common/screens/bonfires/index.js b/common/screens/bonfires/index.js
deleted file mode 100644
index 5557fd9f16..0000000000
--- a/common/screens/bonfires/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./Bonfires.jsx');
diff --git a/common/screens/context/Actions.js b/common/screens/context/Actions.js
deleted file mode 100644
index 83e06c38e1..0000000000
--- a/common/screens/context/Actions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var debug = require('debug')('freecc:context'),
-    BonfireActions = require('../bonfires/Actions'),
-    BonfireStore = require('../bonfires/Store');
-
-var {
-  Action,
-  waitFor
-} = require('thundercats');
-
-var actions = Action.createActions([
-  'setContext',
-  'renderToUser'
-]);
-
-actions
-  .setContext
-  .filter(function(ctx) {
-    return ctx.state.path.indexOf('/bonfire') !== -1;
-  })
-  .subscribe(function(ctx) {
-    debug('set ctx');
-    BonfireActions.getBonfire(ctx.state.params);
-    waitFor(BonfireStore)
-      .firstOrDefault()
-      .catch(function(err) {
-        // handle timeout error
-        debug('err', err);
-      })
-      .subscribe(function() {
-        actions.renderToUser(ctx);
-      });
-  });
-
-module.exports = actions;
diff --git a/common/screens/context/Store.js b/common/screens/context/Store.js
deleted file mode 100644
index f94308ace1..0000000000
--- a/common/screens/context/Store.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var Store = require('thundercats').Store,
-    ContextActions = require('./Actions');
-
-var ContextStore = Store.create({
-  getInitialValue: function() {
-    return {};
-  },
-
-  getOperations: function() {
-    return ContextActions
-      .renderToUser
-      .map(function(ctx) {
-        return { value: ctx };
-      });
-  }
-});
-
-module.exports = ContextStore;
diff --git a/common/screens/footer/Footer.jsx b/common/screens/footer/Footer.jsx
deleted file mode 100644
index 5dd5e1b296..0000000000
--- a/common/screens/footer/Footer.jsx
+++ /dev/null
@@ -1,106 +0,0 @@
-var React = require('react');
-
-var Footer = React.createClass({
-  render: function() {
-    return (
-      <div className='fcc-footer'>
-        <div className='col-xs-12 hidden-xs hidden-sm'>
-          <a
-            href='http://blog.freecodecamp.com'
-            target='_blank' className='ion-speakerphone'>
-            &nbsp;Blog&nbsp;&nbsp;
-          </a>
-          <a
-            ref='http://www.twitch.tv/freecodecamp'
-            target='_blank' className='ion-social-twitch-outline'>
-            &nbsp;Twitch&nbsp;&nbsp;
-          </a>
-          <a
-            href='http://github.com/freecodecamp'
-            target='_blank'
-            className='ion-social-github'>
-            &nbsp;Github&nbsp;&nbsp;
-          </a>
-          <a
-            href='http://twitter.com/freecodecamp'
-            target='_blank' className='ion-social-twitter'>
-            &nbsp;Twitter&nbsp;&nbsp;
-          </a>
-          <a
-            href='http://facebook.com/freecodecamp'
-            target='_blank'
-            className='ion-social-facebook'>
-            &nbsp;Facebook&nbsp;&nbsp;
-          </a>
-          <a
-            ref='/learn-to-code'
-            className='ion-information-circled'>
-            &nbsp;About&nbsp;&nbsp;
-          </a>
-          <a
-            href='/privacy'
-            className='ion-locked'>
-            &nbsp;Privacy&nbsp;&nbsp;
-          </a>
-        </div>
-        <div className='col-xs-12 visible-xs visible-sm'>
-          <a
-            href='http://blog.freecodecamp.com'
-            target='_blank' className='ion-speakerphone'>
-            <span className='sr-only'>
-              Free Code Camp\'s Blog
-            </span>
-          </a>
-          <a
-            href='http://www.twitch.tv/freecodecamp'
-            target='_blank'
-            className='ion-social-twitch-outline'>
-            <span className='sr-only'>
-              Free Code Camp Live Pair Programming on Twitch.tv
-            </span>
-          </a>
-          <a
-            href='http://github.com/freecodecamp'
-            target='_blank'
-            className='ion-social-github'>
-            <span className='sr-only'>
-              Free Code Camp on GitHub
-            </span>
-          </a>
-          <a
-            href='http://twitter.com/freecodecamp'
-            target='_blank'
-            className='ion-social-twitter'>
-            <span className='sr-only'>
-              Free Code Camp on Twitter
-            </span>
-          </a>
-          <a
-            href='http://facebook.com/freecodecamp'
-            target='_blank'
-            className='ion-social-facebook'>
-            <span className='sr-only'>
-              Free Code Camp on Facebook
-            </span>
-          </a>
-          <a
-            href='/learn-to-code'
-            className='ion-information-circled'>
-            <span className='sr-only'>
-              About Free Code Camp
-            </span>
-          </a>
-          <a
-            href='/privacy'
-            className='ion-locked'>
-            <span className='sr-only'>
-              Free Code Camp's Privacy Policy
-            </span>
-          </a>
-        </div>
-      </div>
-    );
-  }
-});
-
-module.exports = Footer;
diff --git a/common/screens/footer/index.js b/common/screens/footer/index.js
deleted file mode 100644
index 286ef5f0fb..0000000000
--- a/common/screens/footer/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./Footer.jsx');
diff --git a/common/screens/nav/index.js b/common/screens/nav/index.js
deleted file mode 100644
index cdf087548a..0000000000
--- a/common/screens/nav/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./Nav.jsx');
diff --git a/package.json b/package.json
index d156bb0873..8213e9ac72 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,6 @@
     "node-uuid": "^1.4.3",
     "nodemailer": "~1.3.0",
     "passport-facebook": "^2.0.0",
-    "passport-google-oauth": "^0.2.0",
     "passport-google-oauth2": "^0.1.6",
     "passport-linkedin-oauth2": "^1.2.1",
     "passport-local": "^1.0.0",
@@ -80,9 +79,13 @@
     "passport-twitter": "^1.0.3",
     "pmx": "^0.3.16",
     "ramda": "~0.10.0",
+    "react": "^0.13.3",
+    "react-bootstrap": "^0.23.4",
+    "react-router": "^1.0.0-beta1",
     "request": "~2.53.0",
     "rx": "^2.5.3",
     "sanitize-html": "~1.6.1",
+    "thundercats": "^2.0.0-rc6",
     "twit": "~1.1.20",
     "uglify-js": "~2.4.15",
     "validator": "~3.22.1",

From caacee79592ce5dd1ba93734621dcdfa9e08f945 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 17 Jun 2015 21:13:47 -0700
Subject: [PATCH 33/54] fix should be env not ENV

---
 server/passport-providers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/passport-providers.js b/server/passport-providers.js
index 907b4c849a..09acd70707 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -105,7 +105,7 @@ module.exports = {
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_fullprofile', 'r_emailaddress'],
     oAuthOptions: {
-      state: process.ENV.LINKED_STATE
+      state: process.env.LINKED_STATE
     },
     failureFlash: true
   },
@@ -122,7 +122,7 @@ module.exports = {
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_fullprofile', 'r_emailaddress'],
     authOptions: {
-      state: process.ENV.LINKED_STATE
+      state: process.env.LINKED_STATE
     },
     failureFlash: true
   }

From c56c8fb310eca02bd63e71650470171748c2d12d Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 17 Jun 2015 21:43:22 -0700
Subject: [PATCH 34/54] fix linkedin/google should be oath2 fix should be
 authOptions not oAuthOptions fix should be LINKEDIN_STATE not LINKED_STATE

---
 server/passport-providers.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/passport-providers.js b/server/passport-providers.js
index 09acd70707..0ed49cefda 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -41,6 +41,7 @@ module.exports = {
   },
   'google-login': {
     provider: 'google',
+    authScheme: 'oauth2',
     module: 'passport-google-oauth2',
     clientID: process.env.GOOGLE_ID,
     clientSecret: process.env.GOOGLE_SECRET,
@@ -54,6 +55,7 @@ module.exports = {
   },
   'google-link': {
     provider: 'google',
+    authScheme: 'oauth2',
     module: 'passport-google-oauth2',
     clientID: process.env.GOOGLE_ID,
     clientSecret: process.env.GOOGLE_SECRET,
@@ -94,7 +96,7 @@ module.exports = {
   },
   'linkedin-login': {
     provider: 'linkedin',
-    authScheme: 'oauth',
+    authScheme: 'oauth2',
     module: 'passport-linkedin-oauth2',
     authPath: '/auth/linkedin',
     callbackURL: '/auth/linkedin/callback',
@@ -104,14 +106,14 @@ module.exports = {
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_fullprofile', 'r_emailaddress'],
-    oAuthOptions: {
-      state: process.env.LINKED_STATE
+    authOptions: {
+      state: process.env.LINKEDIN_STATE
     },
     failureFlash: true
   },
   'linkedin-link': {
     provider: 'linkedin',
-    authScheme: 'oauth',
+    authScheme: 'oauth2',
     module: 'passport-linkedin-oauth2',
     authPath: '/link/linkedin',
     callbackURL: '/link/linkedin/callback',
@@ -122,7 +124,7 @@ module.exports = {
     clientSecret: process.env.LINKEDIN_SECRET,
     scope: ['r_fullprofile', 'r_emailaddress'],
     authOptions: {
-      state: process.env.LINKED_STATE
+      state: process.env.LINKEDIN_STATE
     },
     failureFlash: true
   }

From 1a3e227920551f09b6d8cc5f8a62795ce5f660bf Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Wed, 17 Jun 2015 22:05:37 -0700
Subject: [PATCH 35/54] updated linkedin permissions

---
 server/passport-providers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/passport-providers.js b/server/passport-providers.js
index 3c779a162e..55cfe2adc1 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -103,7 +103,7 @@ module.exports = {
     failureRedirect: failureRedirect,
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
-    scope: ['r_fullprofile', 'r_emailaddress'],
+    scope: ['r_basicprofile', 'r_emailaddress'],
     failureFlash: true
   },
   'linkedin-link': {
@@ -117,7 +117,7 @@ module.exports = {
     failureRedirect: failureRedirect,
     clientID: process.env.LINKEDIN_ID,
     clientSecret: process.env.LINKEDIN_SECRET,
-    scope: ['r_fullprofile', 'r_emailaddress'],
+    scope: ['r_basicprofile', 'r_emailaddress'],
     failureFlash: true
   }
 };

From 842a2efe64785d44a4ffd403bed6a56e352149d3 Mon Sep 17 00:00:00 2001
From: LumenTeun <anton@lutic.org>
Date: Thu, 18 Jun 2015 11:56:13 +0200
Subject: [PATCH 36/54] More test cases for 'Seek and Destroy' #942

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

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index df4b6bc16c..5a553f92ed 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -656,7 +656,10 @@
       ],
       "tests": [
         "assert.deepEqual(destroyer([1, 2, 3, 1, 2, 3], 2, 3), [1, 1], 'should remove correct values from an array');",
-        "assert.deepEqual(destroyer([1, 2, 3, 5, 1, 2, 3], 2, 3), [1, 5, 1], 'should remove correct values from an array');"
+        "assert.deepEqual(destroyer([1, 2, 3, 5, 1, 2, 3], 2, 3), [1, 5, 1], 'should remove correct values from an array');",
+        "assert.deepEqual(destroyer([3, 5, 1, 2, 2], 2, 3, 5), [1], 'should accept more than two additional arguments');",
+        "assert.deepEqual(destroyer([2, 3, 2, 3], 2, 3), [], 'should remove correct values from an array');",
+        "assert.deepEqual(destroyer(['tree', 'hamburger', 53], 'tree', 53), ['hamburger'], 'should handle NaN-elements');"
       ],
       "MDNlinks": [
         "Arguments object",

From 81ae7daff1654cf267efbfd9a9f2fb0ff60f3b45 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 12:27:28 -0700
Subject: [PATCH 37/54] fix try using oath instead of oauth2 for google

---
 server/passport-providers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/passport-providers.js b/server/passport-providers.js
index a17d59a068..b60ad8f51e 100644
--- a/server/passport-providers.js
+++ b/server/passport-providers.js
@@ -41,7 +41,7 @@ module.exports = {
   },
   'google-login': {
     provider: 'google',
-    authScheme: 'oauth2',
+    authScheme: 'oauth',
     module: 'passport-google-oauth2',
     clientID: process.env.GOOGLE_ID,
     clientSecret: process.env.GOOGLE_SECRET,
@@ -55,7 +55,7 @@ module.exports = {
   },
   'google-link': {
     provider: 'google',
-    authScheme: 'oauth2',
+    authScheme: 'oauth',
     module: 'passport-google-oauth2',
     clientID: process.env.GOOGLE_ID,
     clientSecret: process.env.GOOGLE_SECRET,

From 9c14e5846da7ec0497ba4f0b5bba644b46283bf1 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 13:12:35 -0700
Subject: [PATCH 38/54] add www.freecodecamp.org to trusted list

---
 server/server.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/server.js b/server/server.js
index 27ec95b289..0760aa6b08 100755
--- a/server/server.js
+++ b/server/server.js
@@ -98,6 +98,8 @@ var trusted = [
   'https://freecodecamp.com',
   'https://freecodecamp.org',
   '*.freecodecamp.org',
+  // NOTE(berks): add the following as the blob above was not covering www
+  'http://www.freecodecamp.org',
   'ws://freecodecamp.com/',
   'ws://www.freecodecamp.com/',
   '*.gstatic.com',

From 0173804e21c7038910040756e6fd9e32b6235373 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 18 Jun 2015 17:08:21 -0400
Subject: [PATCH 39/54] updates helmet policies, makes new startup script

---
 pm2Start.js                                   | 10 +++
 .../coursewaresJSFramework_0.0.5.js           | 67 ++++++++++++-------
 server/server.js                              |  3 +-
 3 files changed, 55 insertions(+), 25 deletions(-)
 create mode 100644 pm2Start.js

diff --git a/pm2Start.js b/pm2Start.js
new file mode 100644
index 0000000000..f096f0bca6
--- /dev/null
+++ b/pm2Start.js
@@ -0,0 +1,10 @@
+var pm2 = require('pm2');
+pm2.connect(function() {
+  pm2.start({
+    script: 'server/server.js',
+    exec_mode: 'fork',
+    max_memory_restart: '900M'
+  }, function(err, apps) {
+    pm2.disconnect();
+  });
+});
diff --git a/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js b/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js
index 2183c226d7..b62e752a99 100644
--- a/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js
+++ b/public/js/lib/coursewares/coursewaresJSFramework_0.0.5.js
@@ -18,7 +18,7 @@ editor.setSize("100%", "auto");
 // Hijack tab key to enter two spaces intead
 editor.setOption("extraKeys", {
   Tab: function(cm) {
-    if (cm.somethingSelected()){
+    if (cm.somethingSelected()) {
       cm.indentSelection("add");
     } else {
       var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
@@ -26,7 +26,7 @@ editor.setOption("extraKeys", {
     }
   },
   "Shift-Tab": function(cm) {
-    if (cm.somethingSelected()){
+    if (cm.somethingSelected()) {
       cm.indentSelection("subtract");
     } else {
       var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
@@ -61,7 +61,10 @@ codeOutput.setValue('/**\n' +
   ' */');
 codeOutput.setSize("100%", "100%");
 var info = editor.getScrollInfo();
-var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top;
+var after = editor.charCoords({
+  line: editor.getCursor().line + 1,
+  ch: 0
+}, "local").top;
 if (info.top + info.clientHeight < after)
   editor.scrollTo(null, after - info.clientHeight + 3);
 
@@ -83,8 +86,8 @@ editorValue = allSeeds;
 
 myCodeMirror.setValue(editorValue);
 
-function doLinting () {
-  editor.operation(function () {
+function doLinting() {
+  editor.operation(function() {
     for (var i = 0; i < widgets.length; ++i)
       editor.removeLineWidget(widgets[i]);
     widgets.length = 0;
@@ -106,14 +109,14 @@ function doLinting () {
   });
 };
 
-$('#submitButton').on('click', function () {
+$('#submitButton').on('click', function() {
   bonfireExecute();
 });
 
 function bonfireExecute() {
   attempts++;
-  ga('send', 'event',  'Challenge', 'ran-code', challenge_Name);
-  userTests= null;
+  ga('send', 'event', 'Challenge', 'ran-code', challenge_Name);
+  userTests = null;
   $('#codeOutput').empty();
   var userJavaScript = myCodeMirror.getValue();
   userJavaScript = removeComments(userJavaScript);
@@ -145,16 +148,23 @@ var scrapeTests = function(userJavaScript) {
   }
 
   var counter = 0;
-  var regex = new RegExp(/(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/);
+  var regex = new RegExp(
+    /(expect(\s+)?\(.*\;)|(assert(\s+)?\(.*\;)|(assert\.\w.*\;)|(.*\.should\..*\;)/
+  );
   var match = regex.exec(userJavaScript);
   while (match != null) {
     var replacement = '//' + counter + testSalt;
-    userJavaScript = userJavaScript.substring(0, match.index) + replacement + userJavaScript.substring(match.index + match[0].length);
+    userJavaScript = userJavaScript.substring(0, match.index) + replacement +
+      userJavaScript.substring(match.index + match[0].length);
 
     if (!userTests) {
-      userTests= [];
+      userTests = [];
     }
-    userTests.push({"text": match[0], "line": counter, "err": null});
+    userTests.push({
+      "text": match[0],
+      "line": counter,
+      "err": null
+    });
     counter++;
     match = regex.exec(userJavaScript);
   }
@@ -176,17 +186,22 @@ var createTestDisplay = function() {
   if (pushed) {
     userTests.pop();
   }
-  for (var i = 0; i < userTests.length;i++) {
+  for (var i = 0; i < userTests.length; i++) {
     var test = userTests[i];
     var testDoc = document.createElement("div");
     if (test.err != null) {
       console.log('Should be displaying bad tests');
       $(testDoc)
-        .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable test-vertical-center grayed-out-test-output'>" + test.text + "</div><div class='col-xs-10 test-output wrappable'>" + test.err + "</div></div><div class='ten-pixel-break'/>")
+        .html(
+          "<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-output wrappable test-vertical-center grayed-out-test-output'>" +
+          test.text + "</div><div class='col-xs-10 test-output wrappable'>" +
+          test.err + "</div></div><div class='ten-pixel-break'/>")
         .appendTo($('#testSuite'));
     } else {
       $(testDoc)
-        .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" + test.text + "</div></div><div class='ten-pixel-break'/>")
+        .html(
+          "<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable grayed-out-test-output'>" +
+          test.text + "</div></div><div class='ten-pixel-break'/>")
         .appendTo($('#testSuite'));
     }
   };
@@ -208,18 +223,21 @@ var runTests = function(err, data) {
   pushed = false;
   $('#testSuite').children().remove();
   if (err && userTests.length > 0) {
-    userTests= [{text:"Program Execution Failure", err: "No user tests were run."}];
+    userTests = [{
+      text: "Program Execution Failure",
+      err: "No user tests were run."
+    }];
     createTestDisplay();
   } else if (userTests) {
     userTests.push(false);
     pushed = true;
-    userTests.forEach(function(chaiTestFromJSON, indexOfTestArray, __testArray){
+    userTests.forEach(function(chaiTestFromJSON, indexOfTestArray,
+      __testArray) {
       try {
         if (chaiTestFromJSON) {
           var output = eval(reassembleTest(chaiTestFromJSON, data));
-          debugger;
         }
-      } catch(error) {
+      } catch (error) {
         allTestsPassed = false;
         __testArray[indexOfTestArray].err = error.message;
       } finally {
@@ -239,12 +257,12 @@ var runTests = function(err, data) {
 
 function showCompletion() {
   var time = Math.floor(Date.now()) - started;
-  ga('send', 'event',  'Challenge', 'solved', challenge_Name + ', Time: ' + time +', Attempts: ' + attempts);
+  ga('send', 'event', 'Challenge', 'solved', challenge_Name + ', Time: ' + time +
+    ', Attempts: ' + attempts);
   var bonfireSolution = myCodeMirror.getValue();
   var didCompleteWith = $('#completed-with').val() || null;
   $.post(
-    '/completed-bonfire/',
-    {
+    '/completed-bonfire/', {
       challengeInfo: {
         challengeId: challenge_Id,
         challengeName: challenge_Name,
@@ -252,10 +270,11 @@ function showCompletion() {
         challengeType: challengeType,
         solution: bonfireSolution
       }
-    }, function(res) {
+    },
+    function(res) {
       if (res) {
         $('#complete-courseware-dialog').modal('show');
-        $('#complete-courseware-dialog').keydown(function (e) {
+        $('#complete-courseware-dialog').keydown(function(e) {
           if (e.ctrlKey && e.keyCode == 13) {
             $('#next-courseware-button').click();
           }
diff --git a/server/server.js b/server/server.js
index 0760aa6b08..3b6cbafa85 100755
--- a/server/server.js
+++ b/server/server.js
@@ -145,7 +145,8 @@ app.use(helmet.csp({
     '*.aspnetcdn.com',
     '*.d3js.org',
     'https://cdn.inspectlet.com/inspectlet.js',
-    'http://cdn.inspectlet.com/inspectlet.js'
+    'http://cdn.inspectlet.com/inspectlet.js',
+    'http://www.freecodecamp.org'
   ].concat(trusted),
   'connect-src': [].concat(trusted),
   styleSrc: [

From b24699a43e939028cf5b2bcc357ddcb0e6bceff4 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 18 Jun 2015 17:33:34 -0400
Subject: [PATCH 40/54] updates pm2 startup script

---
 pm2Start.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pm2Start.js b/pm2Start.js
index f096f0bca6..052f3bdbfa 100644
--- a/pm2Start.js
+++ b/pm2Start.js
@@ -1,8 +1,10 @@
 var pm2 = require('pm2');
 pm2.connect(function() {
   pm2.start({
+    name: 'server',
     script: 'server/server.js',
-    exec_mode: 'fork',
+    exec_mode: 'cluster',
+    instances: '2',
     max_memory_restart: '900M'
   }, function(err, apps) {
     pm2.disconnect();

From 4560cfed03582f59e413c7f40124d5a42b3fcc5c Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 13:16:23 -0700
Subject: [PATCH 41/54] deleted old setup file

---
 setup.js | 749 -------------------------------------------------------
 1 file changed, 749 deletions(-)
 delete mode 100644 setup.js

diff --git a/setup.js b/setup.js
deleted file mode 100644
index 652e4ce228..0000000000
--- a/setup.js
+++ /dev/null
@@ -1,749 +0,0 @@
-var fs = require('fs');
-var os = require('os');
-var blessed = require('blessed');
-var multiline = require('multiline');
-
-if (os.platform() === 'win32') {
-  console.log('**************************************************************');
-  console.log('Hackathon Starter Generator has been disabled on Windows until');
-  console.log('https://github.com/chjj/blessed is fixed or until I find a');
-  console.log('better CLI module.');
-  console.log('**************************************************************');
-  process.exit();
-}
-var screen = blessed.screen({
-  autoPadding: true
-});
-
-screen.key('q', function() {
-  process.exit(0);
-});
-
-var home = blessed.list({
-  parent: screen,
-  padding: { top: 2 },
-  mouse: true,
-  keys: true,
-  fg: 'white',
-  bg: 'blue',
-  selectedFg: 'blue',
-  selectedBg: 'white',
-  items: [
-    '» REMOVE AUTHENTICATION PROVIDER',
-    '» CHANGE EMAIL SERVICE',
-    '» ADD NODE.JS CLUSTER SUPPORT',
-    '» EXIT'
-  ]
-});
-
-var homeTitle = blessed.text({
-  parent: screen,
-  align: 'center',
-  fg: 'blue',
-  bg: 'white',
-  content: 'Hackathon Starter (c) 2014'
-});
-
-var footer = blessed.text({
-  parent: screen,
-  bottom: 0,
-  fg: 'white',
-  bg: 'blue',
-  tags: true,
-  content: ' {cyan-fg}<Up/Down>{/cyan-fg} moves |' +
-    ' {cyan-fg}<Enter>{/cyan-fg} selects | {cyan-fg}<q>{/cyan-fg} exits'
-});
-
-var inner = blessed.form({
-  top: 'center',
-  left: 'center',
-  mouse: true,
-  keys: true,
-  width: 33,
-  height: 10,
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'red'
-  },
-  fg: 'white',
-  bg: 'red'
-});
-
-var success = blessed.box({
-  top: 'center',
-  left: 'center',
-  mouse: true,
-  keys: true,
-  tags: true,
-  width: '50%',
-  height: '40%',
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'green'
-  },
-  fg: 'white',
-  bg: 'green',
-  padding: 1
-});
-
-success.on('keypress', function() {
-  home.focus();
-  home.remove(success);
-});
-
-var clusterText = blessed.text({
-  top: 'top',
-  bg: 'red',
-  fg: 'white',
-  tags: true,
-  content: 'Take advantage of multi-core systems' +
-    ' using built-in {underline}cluster{/underline} module.'
-});
-
-
-var enable = blessed.button({
-  parent: inner,
-  bottom: 0,
-  mouse: true,
-  shrink: true,
-  name: 'enable',
-  content: ' ENABLE ',
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'red'
-  },
-  style: {
-    fg: 'white',
-    bg: 'red',
-    focus: {
-      fg: 'red',
-      bg: 'white'
-    }
-  }
-});
-
-
-var disable = blessed.button({
-  parent: inner,
-  bottom: 0,
-  left: 10,
-  mouse: true,
-  shrink: true,
-  name: 'disable',
-  content: ' DISABLE ',
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'red'
-  },
-  style: {
-    fg: 'white',
-    bg: 'red',
-    focus: {
-      fg: 'red',
-      bg: 'white'
-    }
-  }
-});
-
-var cancel = blessed.button({
-  parent: inner,
-  bottom: 0,
-  left: 21,
-  mouse: true,
-  shrink: true,
-  name: 'cancel',
-  content: ' CANCEL ',
-  border: {
-    type: 'line',
-    fg: 'white',
-    bg: 'red'
-  },
-  style: {
-    fg: 'white',
-    bg: 'red',
-    focus: {
-      fg: 'red',
-      bg: 'white'
-    }
-  }
-});
-
-cancel.on('press', function() {
-  home.focus();
-  home.remove(inner);
-  screen.render();
-
-});
-
-var authForm = blessed.form({
-  mouse: true,
-  keys: true,
-  fg: 'white',
-  bg: 'blue',
-  padding: { left: 1, right: 1 }
-});
-
-authForm.on('submit', function() {
-  var passportConfig = fs.readFileSync('config/passport.js')
-    .toString().split(os.EOL);
-  var loginTemplate = fs.readFileSync('views/account/login.jade')
-    .toString().split(os.EOL);
-  var profileTemplate = fs.readFileSync('views/account/profile.jade')
-    .toString().split(os.EOL);
-  var userModel = fs.readFileSync('models/User.js').toString().split(os.EOL);
-  var app = fs.readFileSync('app.js').toString().split(os.EOL);
-  var secrets = fs.readFileSync('config/secrets.js').toString().split(os.EOL);
-
-  var index = passportConfig
-    .indexOf('var FacebookStrategy = require("passport-facebook").Strategy;');
-  if (facebookCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with Facebook.');
-    passportConfig.splice(index, 47);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      '      a.btn.btn-block.btn-facebook.btn-social(href="/auth/facebook")'
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.facebook');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  facebook: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf([
-      'app.get("/auth/facebook"',
-      'passport.authenticate("facebook",',
-      ' { scope: ["email", "user_location"] }));'
-    ].join(' '));
-
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    "var GitHubStrategy = require('passport-github').Strategy;"
-  );
-  if (githubCheckbox.checked && index !== -1) {
-    console.log(index);
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with GitHub.');
-    passportConfig.splice(index, 48);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      "      a.btn.btn-block.btn-github.btn-social(href='/auth/github')"
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.github');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  github: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf(
-      'app.get("/auth/github", passport.authenticate("github"));'
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    'var GoogleStrategy = require("passport-google-oauth").OAuth2Strategy;'
-  );
-  if (googleCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with Google.');
-    passportConfig.splice(index, 46);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      "      a.btn.btn-block.btn-google-plus.btn-social(href='/auth/google')"
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.google');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  google: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf(
-      'app.get("/auth/google",' +
-      ' passport.authenticate("google", { scope: "profile email" }));'
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    'var TwitterStrategy = require("passport-twitter").Strategy;'
-  );
-  if (twitterCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with Twitter.');
-    passportConfig.splice(index, 43);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      '      a.btn.btn-block.btn-twitter.btn-social(href="/auth/twitter")'
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.twitter');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade', profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  twitter: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf(
-      "app.get('/auth/twitter', passport.authenticate('twitter'));"
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    'var LinkedInStrategy = require("passport-linkedin-oauth2").Strategy;'
-  );
-  if (linkedinCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with LinkedIn.');
-    passportConfig.splice(index, 47);
-    fs.writeFileSync('config/passport.js', passportConfig.join(os.EOL));
-
-    index = loginTemplate.indexOf(
-      '      a.btn.btn-block.btn-linkedin.btn-social(href="/auth/linkedin")'
-    );
-    loginTemplate.splice(index, 3);
-    fs.writeFileSync('views/account/login.jade', loginTemplate.join(os.EOL));
-
-    index = profileTemplate.indexOf('  if user.linkedin');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = userModel.indexOf('  linkedin: String,');
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-
-    index = app.indexOf(
-      'app.get("/auth/linkedin",',
-      ' passport.authenticate("linkedin", { state: "SOME STATE" }));'
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-  }
-
-  index = passportConfig.indexOf(
-    'var InstagramStrategy = require("passport-instagram").Strategy;'
-  );
-  if (instagramCheckbox.checked && index !== -1) {
-    passportConfig.splice(index, 1);
-    index = passportConfig.indexOf('// Sign in with Instagram.');
-    passportConfig.splice(index, 43);
-    fs.writeFileSync(
-      'config/passport.js',
-      passportConfig.join(os.EOL)
-    );
-
-    index = loginTemplate.indexOf(
-      '      a.btn.btn-block.btn-instagram.btn-social(href="/auth/instagram")'
-    );
-    loginTemplate.splice(index, 3);
-
-    fs.writeFileSync(
-      'views/account/login.jade',
-      loginTemplate.join(os.EOL)
-    );
-
-    index = profileTemplate.indexOf('  if user.instagram');
-    profileTemplate.splice(index - 1, 5);
-    fs.writeFileSync(
-      'views/account/profile.jade',
-      profileTemplate.join(os.EOL)
-    );
-
-    index = app.indexOf(
-      'app.get("/auth/instagram", passport.authenticate("instagram"));'
-    );
-    app.splice(index, 4);
-    fs.writeFileSync('app.js', app.join(os.EOL));
-
-    userModel.splice(index, 1);
-    fs.writeFileSync('models/User.js', userModel.join(os.EOL));
-  }
-
-  home.remove(authForm);
-  home.append(success);
-  success.setContent(
-    'Selected authentication providers have been removed' +
-    'from passportConfig.js, User.js, server.js, login.jade and profile.jade!'
-  );
-  success.focus();
-  screen.render();
-});
-
-var authText = blessed.text({
-  parent: authForm,
-  content: 'Selecting a checkbox removes an authentication provider.' +
-    ' If authentication provider is already removed, no action will be taken.',
-  padding: 1,
-  bg: 'magenta',
-  fg: 'white'
-});
-
-var facebookCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 6,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Facebook'
-});
-
-var githubCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 7,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'GitHub'
-});
-
-var googleCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 8,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Google'
-});
-
-var twitterCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 9,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Twitter'
-});
-
-var linkedinCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 10,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'LinkedIn'
-});
-
-var instagramCheckbox = blessed.checkbox({
-  parent: authForm,
-  top: 11,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Instagram'
-});
-
-var authSubmit = blessed.button({
-  parent: authForm,
-  top: 13,
-  mouse: true,
-  shrink: true,
-  name: 'submit',
-  content: ' SUBMIT ',
-  style: {
-    fg: 'blue',
-    bg: 'white',
-    focus: {
-      fg: 'white',
-      bg: 'red'
-    }
-  }
-});
-
-authSubmit.on('press', function() {
-  authForm.submit();
-});
-
-var authCancel = blessed.button({
-  parent: authForm,
-  top: 13,
-  left: 9,
-  mouse: true,
-  shrink: true,
-  name: 'cancel',
-  content: ' CANCEL ',
-  style: {
-    fg: 'blue',
-    bg: 'white',
-    focus: {
-      fg: 'white',
-      bg: 'red'
-    }
-  }
-});
-
-authCancel.on('press', function() {
-  home.focus();
-  home.remove(authForm);
-  screen.render();
-});
-
-var emailForm = blessed.form({
-  mouse: true,
-  keys: true,
-  fg: 'white',
-  bg: 'blue',
-  padding: { left: 1, right: 1 }
-});
-
-emailForm.on('submit', function() {
-  var contactCtrl = fs.readFileSync('controllers/contact.js')
-    .toString().split(os.EOL);
-  var userCtrl = fs.readFileSync('controllers/user.js')
-    .toString().split(os.EOL);
-  var choice = null;
-
-  if (sendgridRadio.checked) {
-    choice = 'SendGrid';
-  } else if (mailgunRadio.checked) {
-    choice = 'Mailgun';
-  } else if (mandrillRadio.checked) {
-    choice = 'Mandrill';
-  }
-
-  var index = contactCtrl.indexOf(
-    'var transporter = nodemailer.createTransport({'
-  );
-  contactCtrl.splice(index + 1, 1, "  service: '" + choice + "',");
-  contactCtrl.splice(
-    index + 3,
-    1,
-    '    user: secrets.' + choice.toLowerCase() + '.user,'
-  );
-  contactCtrl.splice(
-    index + 4,
-    1,
-    '    pass: secrets.' + choice.toLowerCase() + '.password'
-  );
-  fs.writeFileSync('controllers/contact.js', contactCtrl.join(os.EOL));
-
-  index = userCtrl.indexOf(
-    '      var transporter = nodemailer.createTransport({'
-  );
-  userCtrl.splice(index + 1, 1, "        service: '" + choice + "',");
-  userCtrl.splice(
-    index + 3,
-    1,
-    '          user: secrets.' + choice.toLowerCase() + '.user,'
-  );
-  userCtrl.splice(
-    index + 4,
-    1,
-    '          pass: secrets.' + choice.toLowerCase() + '.password'
-  );
-
-  index = userCtrl.indexOf(
-    '      var transporter = nodemailer.createTransport({',
-    (index + 1)
-  );
-  userCtrl.splice(
-    index + 1,
-    1,
-    '        service: "' + choice + '",'
-  );
-
-  userCtrl.splice(
-    index + 3,
-    1,
-    '          user: secrets.' + choice.toLowerCase() + '.user,'
-  );
-  userCtrl.splice(
-    index + 4,
-    1,
-    '          pass: secrets.' + choice.toLowerCase() + '.password'
-  );
-  fs.writeFileSync('controllers/user.js', userCtrl.join(os.EOL));
-
-  home.remove(emailForm);
-  home.append(success);
-  success.setContent('Email Service has been switched to ' + choice);
-  success.focus();
-  screen.render();
-});
-
-var emailText = blessed.text({
-  parent: emailForm,
-  content: 'Select one of the following email service providers ' +
-    'for {underline}contact form{/underline}' +
-    ' and {underline}password reset{/underline}.',
-  padding: 1,
-  bg: 'red',
-  fg: 'white',
-  tags: true
-});
-
-var sendgridRadio = blessed.radiobutton({
-  parent: emailForm,
-  top: 5,
-  checked: true,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'SendGrid'
-});
-
-var mailgunRadio = blessed.radiobutton({
-  parent: emailForm,
-  top: 6,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Mailgun'
-});
-
-var mandrillRadio = blessed.radiobutton({
-  parent: emailForm,
-  top: 7,
-  mouse: true,
-  fg: 'white',
-  bg: 'blue',
-  content: 'Mandrill'
-});
-
-var emailSubmit = blessed.button({
-  parent: emailForm,
-  top: 9,
-  mouse: true,
-  shrink: true,
-  name: 'submit',
-  content: ' SUBMIT ',
-  style: {
-    fg: 'blue',
-    bg: 'white',
-    focus: {
-      fg: 'white',
-      bg: 'red'
-    }
-  }
-});
-
-emailSubmit.on('press', function() {
-  emailForm.submit();
-});
-
-var emailCancel = blessed.button({
-  parent: emailForm,
-  top: 9,
-  left: 9,
-  mouse: true,
-  shrink: true,
-  name: 'cancel',
-  content: ' CANCEL ',
-  style: {
-    fg: 'blue',
-    bg: 'white',
-    focus: {
-      fg: 'white',
-      bg: 'red'
-    }
-  }
-});
-
-emailCancel.on('press', function() {
-  home.focus();
-  home.remove(emailForm);
-  screen.render();
-
-});
-
-home.on('select', function(child, index) {
-  switch (index) {
-    case 0:
-      home.append(authForm);
-      authForm.focus();
-      screen.render();
-      break;
-    case 1:
-      home.append(emailForm);
-      emailForm.focus();
-      break;
-    case 2:
-      addClusterSupport();
-      home.append(success);
-      success.setContent([
-        'New file {underline}cluster_app.js{/underline} has been created.',
-        'Your app is now able to use more than 1 CPU by running',
-        '{underline}node cluster_app.js{/underline}, which in turn',
-        'spawns multiple instances of {underline}server.js{/underline}'
-      ].join(' '));
-      success.focus();
-      screen.render();
-      break;
-    default:
-      process.exit(0);
-  }
-});
-
-screen.render();
-
-
-function addClusterSupport() {
-
-  var fileContents = multiline(function() {
-/*
-var os = require('os');
-var cluster = require('cluster');
-
-cluster.setupMaster({
-  exec: 'server.js'
-});
-
-cluster.on('exit', function(worker) {
-  console.log('worker ' + worker.id + ' died');
-  cluster.fork();
-});
-
-for (var i = 0; i < os.cpus().length; i++) {
-  cluster.fork();
-}
-*/
-  });
-
-  fs.writeFileSync('cluster_app.js', fileContents);
-}

From 2bf8810d794f5df8d3d8768186da3aa1067e8408 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 16:19:24 -0700
Subject: [PATCH 42/54] add pmx errorhandler in beta spot

---
 server/server.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/server.js b/server/server.js
index 3b6cbafa85..bb61e15cd3 100755
--- a/server/server.js
+++ b/server/server.js
@@ -1,5 +1,6 @@
 require('dotenv').load();
-require('pmx').init();
+var pmx = require('pmx');
+pmx.init();
 // handle uncaught exceptions. Forever will restart process on shutdown
 
 var R = require('ramda'),
@@ -20,7 +21,6 @@ var R = require('ramda'),
   path = require('path'),
   expressValidator = require('express-validator'),
   lessMiddleware = require('less-middleware'),
-  pmx = require('pmx'),
 
   passportProviders = require('./passport-providers'),
   /**
@@ -42,11 +42,11 @@ app.set('port', process.env.PORT || 3000);
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-//if (process.env.NODE_ENV === 'production') {
+// if (process.env.NODE_ENV === 'production') {
 //  app.use(forceDomain({
 //    hostname: 'www.freecodecamp.com'
 //  }));
-//}
+// }
 
 app.use(compress());
 app.use(lessMiddleware(path.join(__dirname, '/public')));
@@ -262,6 +262,8 @@ R.keys(passportProviders).map(function(strategy) {
 
 // if (process.env.NODE_ENV === 'development') {
 if (true) { // eslint-disable-line
+  // NOTE(berks): adding pmx here for Beta test. Remove for production
+  app.use(pmx.expressErrorHandler());
   app.use(errorHandler({
     log: true
   }));

From 7735f19fcc03233aa082a38d1ea556d5dd480bb2 Mon Sep 17 00:00:00 2001
From: rcw271828 <rcw271828@users.noreply.github.com>
Date: Thu, 18 Jun 2015 20:36:33 -0400
Subject: [PATCH 43/54] Update field-guides.json

Fixed a typo in languages section of field guides.
---
 seed/field-guides.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/field-guides.json b/seed/field-guides.json
index 2de429b569..9d3e906d16 100644
--- a/seed/field-guides.json
+++ b/seed/field-guides.json
@@ -863,7 +863,7 @@
     "description": [
       "<div class=\"col-xs-12 col-sm-10 col-sm-offset-1\">",
       "  <p class='h2'>Translation is an all-or-nothing proposal.</h2>",
-      "  <p class='large-p'>We won't be able to add new languages to Free Code Camp until all of our challenges are translated into that langauge.</p>",
+      "  <p class='large-p'>We won't be able to add new languages to Free Code Camp until all of our challenges are translated into that language.</p>",
       "  <p class='large-p'>In addition to translating these initially, we'll also need to maintain the translation as the challenges are gradually updated.</p>",
       "  <p class='large-p'>If you're able to help us, you can join our <a href='https://trello.com/b/m7zhwXka/fcc-translation' target='_blank'>Trello board</a> by sending @quincylarson your email address in Slack.</p>",
       "</div>"

From 8ade99b5d738470f7e8d4d38b014ba94c413796c Mon Sep 17 00:00:00 2001
From: Brett Guillory <kurzweilfreak@gmail.com>
Date: Sat, 13 Jun 2015 20:54:43 -0500
Subject: [PATCH 44/54] Fixed a word

---
 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 df4b6bc16c..8ecebec116 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -853,7 +853,7 @@
       "difficulty": "2.03",
       "description": [
         "Perform a search and replace on the sentence using the arguments provided and return the new sentence.",
-        "First argument is the sentence the perform the search and replace on.",
+        "First argument is the sentence to perform the search and replace on.",
         "Second argument is the word that you will be replacing (before).",
         "Third argument is what you will be replacing the second argument with (after).",
         "NOTE: Preserve the case of the original word when you are replacing it. For example if you mean to replace the word 'Book' with the word 'dog', it should be replaced as 'Dog'",

From d6db51355e15e3ba426ceac18cbd754207a99e40 Mon Sep 17 00:00:00 2001
From: Brett Guillory <kurzweilfreak@gmail.com>
Date: Sat, 13 Jun 2015 23:28:33 -0500
Subject: [PATCH 45/54] Added missing MDN Link

This bonfire "Missing letters"seems to be missing an important MDN link to "String.fromCharCode()", which is needed to get the missing character to return for the test. Since the missing character is obviously not in the string supplied, you cannot get the character code for it from the string.
---
 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 8ecebec116..08c797f58c 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -990,7 +990,8 @@
         "expect(fearNotLetter('yz')).to.be.undefined;"
       ],
       "MDNlinks": [
-        "String.charCodeAt()"
+        "String.charCodeAt()",
+        "String.fromCharCode()"
       ],
       "challengeType": 5,
       "nameCn": "",

From 934250387379b454a9258dfd680fa136997de3f6 Mon Sep 17 00:00:00 2001
From: Stephen Wanhella <stephen.wanhella@gmail.com>
Date: Thu, 18 Jun 2015 02:18:18 -0700
Subject: [PATCH 46/54] Added new test with different max number to Bonfire:
 Truncate a String

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

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 08c797f58c..412ed80ad1 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -422,6 +422,7 @@
       ],
       "tests": [
         "expect(truncate('A-tisket a-tasket A green and yellow basket', 11)).to.eqls('A-tisket...');",
+        "expect(truncate('Peter Piper picked a peck of pickled peppers', 14)).to.eqls('Peter Piper...');",
         "assert(truncate('A-tisket a-tasket A green and yellow basket', 'A-tisket a-tasket A green and yellow basket'.length) === 'A-tisket a-tasket A green and yellow basket', 'should not truncate if string is = length');",
         "assert.strictEqual(truncate('A-tisket a-tasket A green and yellow basket', 'A-tisket a-tasket A green and yellow basket'.length + 2), 'A-tisket a-tasket A green and yellow basket', 'should not truncate if string is < length');"
       ],

From 81b77ff8adb8dabcf784a8c61276960c9f949d79 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 17:52:23 -0700
Subject: [PATCH 47/54] increase database timeout

---
 server/datasources.local.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/datasources.local.js b/server/datasources.local.js
index 03a6648e94..15efeb1c1b 100644
--- a/server/datasources.local.js
+++ b/server/datasources.local.js
@@ -3,6 +3,7 @@ var secrets = require('../config/secrets');
 module.exports = {
   db: {
     connector: 'mongodb',
+    timeout: 10000,
     url: process.env.MONGOHQ_URL
   },
   mail: {

From 28f346e830bccdab7e0332f438f9724b8adf7c00 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 19:08:39 -0700
Subject: [PATCH 48/54] fix should be connectionTimeout not timeout

---
 server/datasources.local.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/datasources.local.js b/server/datasources.local.js
index 15efeb1c1b..276a4e8dee 100644
--- a/server/datasources.local.js
+++ b/server/datasources.local.js
@@ -3,7 +3,7 @@ var secrets = require('../config/secrets');
 module.exports = {
   db: {
     connector: 'mongodb',
-    timeout: 10000,
+    connectionTimeout: 15000,
     url: process.env.MONGOHQ_URL
   },
   mail: {

From f84ac9ad12649bdfa87968d43c3c3ea9ace4fddf Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 19:55:56 -0700
Subject: [PATCH 49/54] remove forceDomain

---
 package.json     | 1 -
 server/server.js | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/package.json b/package.json
index 8213e9ac72..4863f4d47a 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,6 @@
     "express-session": "~1.9.2",
     "express-validator": "~2.8.0",
     "font-awesome": "~4.3.0",
-    "forcedomain": "~0.4.0",
     "forever": "~0.14.1",
     "frameguard": "^0.2.2",
     "github-api": "~0.7.0",
diff --git a/server/server.js b/server/server.js
index bb61e15cd3..4d59ccbe7f 100755
--- a/server/server.js
+++ b/server/server.js
@@ -42,12 +42,6 @@ app.set('port', process.env.PORT || 3000);
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-// if (process.env.NODE_ENV === 'production') {
-//  app.use(forceDomain({
-//    hostname: 'www.freecodecamp.com'
-//  }));
-// }
-
 app.use(compress());
 app.use(lessMiddleware(path.join(__dirname, '/public')));
 app.use(logger('dev'));

From adbbbf3743da0a1e2a1285f5121fc45fcb8ae458 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 18 Jun 2015 20:02:32 -0700
Subject: [PATCH 50/54] fix name and dashed name switched close #975

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

diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index df4b6bc16c..d2029d95b3 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -754,8 +754,8 @@
     },
     {
       "id": "a5de63ebea8dbee56860f4f2",
-      "name": "bonfire-diff-two-arrays",
-      "dashedName": "Bonfire: Diff Two Arrays",
+      "name": "Bonfire: Diff Two Arrays",
+      "dashedName": "bonfire-diff-two-arrays",
       "difficulty": "2.01",
       "description": [
         "Compare two arrays and return a new array with any items not found in both of the original arrays.",

From 938568454e94f7ed14c9bab369904cec73493237 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 19 Jun 2015 14:32:17 -0700
Subject: [PATCH 51/54] move getMDNLinks func to utils

---
 server/boot/challenge.js | 20 +++-----------------
 server/utils/index.js    | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index dfa2f98ef2..77346d15fa 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -32,27 +32,13 @@
 
 var R = require('ramda'),
   utils = require('../utils'),
-  userMigration = require('../utils/middleware').userMigration,
-  MDNlinks = require('../../seed/bonfireMDNlinks');
+  userMigration = require('../utils/middleware').userMigration;
 
 var challengeMapWithNames = utils.getChallengeMapWithNames();
 var challengeMapWithIds = utils.getChallengeMapWithIds();
 var challengeMapWithDashedNames = utils.getChallengeMapWithDashedNames();
 
-
-function getMDNlinks(links) {
-  // takes in an array of links, which are strings
-  var populatedLinks = [];
-
-  // for each key value, push the corresponding link
-  // from the MDNlinks object into a new array
-  if (links) {
-    links.forEach(function (value) {
-      populatedLinks.push(MDNlinks[value]);
-    });
-  }
-  return populatedLinks;
-}
+var getMDNLinks = utils.getMDNLinks;
 
 module.exports = function(app) {
   var router = app.loopback.Router();
@@ -295,7 +281,7 @@ module.exports = function(app) {
               bonfires: challenge,
               challengeId: challenge.id,
               MDNkeys: challenge.MDNlinks,
-              MDNlinks: getMDNlinks(challenge.MDNlinks),
+              MDNlinks: getMDNLinks(challenge.MDNlinks),
               challengeType: challenge.challengeType
             });
           }
diff --git a/server/utils/index.js b/server/utils/index.js
index 6b7b342e56..bff016241c 100644
--- a/server/utils/index.js
+++ b/server/utils/index.js
@@ -7,6 +7,7 @@ var path = require('path'),
     fs = require('fs'),
 
 
+    MDNlinks = require('../../seed/bonfireMDNlinks'),
     resources = require('./resources.json'),
     nonprofits = require('../../seed/nonprofits.json'),
     fieldGuides = require('../../seed/field-guides.json');
@@ -16,7 +17,7 @@ var path = require('path'),
  */
 var allFieldGuideIds, allFieldGuideNames, allNonprofitNames,
   challengeMap, challengeMapForDisplay, challengeMapWithIds,
-  challengeMapWithNames, allChallengeIds, allChallenges,
+  challengeMapWithNames, allChallengeIds,
   challengeMapWithDashedNames;
 
 /**
@@ -216,5 +217,18 @@ module.exports = {
         }
       });
     })();
+  },
+
+  getMDNLinks: function(links) {
+    if (!links) {
+      return [];
+    }
+    // takes in an array of links, which are strings
+
+    // for each key value, push the corresponding link
+    // from the MDNlinks object into a new array
+    return links.map(function(value) {
+      return MDNlinks[value];
+    });
   }
 };

From 12b055353e3eb6242da83652a70e2bef0404ab42 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 19 Jun 2015 14:49:10 -0700
Subject: [PATCH 52/54] remove challangeMap move to challenges router

---
 server/boot/challenge.js    | 67 ++++++++++++++++++++++++++++++-------
 server/boot/challengeMap.js | 66 ------------------------------------
 server/boot/redirects.js    |  8 +++++
 3 files changed, 62 insertions(+), 79 deletions(-)
 delete mode 100644 server/boot/challengeMap.js

diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 77346d15fa..bddf9118c4 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -45,23 +45,17 @@ module.exports = function(app) {
   var Challenge = app.models.Challenge;
   var User = app.models.User;
 
-  router.get(
-    '/challenges/next-challenge',
-    userMigration,
-    returnNextChallenge
-  );
-
-  router.get(
-    '/challenges/:challengeName',
-    userMigration,
-    returnIndividualChallenge
-  );
-
-  router.get('/challenges/', userMigration, returnCurrentChallenge);
   router.post('/completed-challenge/', completedChallenge);
   router.post('/completed-zipline-or-basejump', completedZiplineOrBasejump);
   router.post('/completed-bonfire', completedBonfire);
 
+  // the follow routes are covered by userMigration
+  router.use(userMigration);
+  router.get('/challenges/next-challenge', returnNextChallenge);
+  router.get('/challenges/:challengeName', returnIndividualChallenge);
+  router.get('/challenges/', returnCurrentChallenge);
+  router.get('/map', challengeMap);
+
   app.use(router);
 
   function returnNextChallenge(req, res, next) {
@@ -533,4 +527,51 @@ module.exports = function(app) {
       });
     }
   }
+
+  function challengeMap(req, res, next) {
+    var completedList = [];
+
+    if (req.user) {
+      completedList = req.user.completedChallenges;
+    }
+
+    var noDuplicatedChallenges = R.uniq(completedList);
+
+    var completedChallengeList = noDuplicatedChallenges
+      .map(function(challenge) {
+        // backwards compatibility
+        return (challenge.id || challenge._id);
+      });
+    var challengeList = utils.
+      getChallengeMapForDisplay(completedChallengeList);
+
+    Object.keys(challengeList).forEach(function(key) {
+      challengeList[key].completed = challengeList[key]
+        .challenges.filter(function(elem) {
+        // backwards compatibility hack
+        return completedChallengeList.indexOf(elem.id || elem._id) > -1;
+      });
+    });
+
+    function numberWithCommas(x) {
+      return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    }
+
+    var date1 = new Date('10/15/2014');
+    var date2 = new Date();
+    var timeDiff = Math.abs(date2.getTime() - date1.getTime());
+    var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
+
+    User.count(function(err, camperCount) {
+      if (err) { return next(err); }
+
+      res.render('challengeMap/show', {
+        daysRunning: daysRunning,
+        camperCount: numberWithCommas(camperCount),
+        title: "A map of all Free Code Camp's Challenges",
+        challengeList: challengeList,
+        completedChallengeList: completedChallengeList
+      });
+    });
+  }
 };
diff --git a/server/boot/challengeMap.js b/server/boot/challengeMap.js
deleted file mode 100644
index 3b7adf2489..0000000000
--- a/server/boot/challengeMap.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var R = require('ramda'),
-  // debug = require('debug')('freecc:cntr:challengeMap'),
-  utils = require('./../utils'),
-  middleware = require('../utils/middleware');
-
-
-module.exports = function(app) {
-  var User = app.models.User;
-  var router = app.loopback.Router();
-
-  router.get('/map', middleware.userMigration, challengeMap);
-  router.get('/learn-to-code', function(req, res) {
-    res.redirect(301, '/map');
-  });
-  router.get('/about', function(req, res) {
-    res.redirect(301, '/map');
-  });
-
-  app.use(router);
-
-  function challengeMap(req, res, next) {
-    var completedList = [];
-
-    if (req.user) {
-      completedList = req.user.completedChallenges;
-    }
-
-    var noDuplicatedChallenges = R.uniq(completedList);
-
-    var completedChallengeList = noDuplicatedChallenges
-      .map(function(challenge) {
-        return (challenge.id || challenge._id); // backwards compatibility
-      });
-    var challengeList = utils.
-      getChallengeMapForDisplay(completedChallengeList);
-
-    Object.keys(challengeList).forEach(function(key) {
-      challengeList[key].completed = challengeList[key]
-        .challenges.filter(function(elem) {
-        return completedChallengeList.indexOf(elem.id || elem._id) > -1;
-          //backwards compatibility hack
-      });
-    });
-
-    function numberWithCommas(x) {
-      return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-    }
-
-    var date1 = new Date('10/15/2014');
-    var date2 = new Date();
-    var timeDiff = Math.abs(date2.getTime() - date1.getTime());
-    var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
-
-    User.count(function(err, camperCount) {
-      if (err) { return next(err); }
-
-      res.render('challengeMap/show', {
-        daysRunning: daysRunning,
-        camperCount: numberWithCommas(camperCount),
-        title: "A map of all Free Code Camp's Challenges",
-        challengeList: challengeList,
-        completedChallengeList: completedChallengeList
-      });
-    });
-  }
-};
diff --git a/server/boot/redirects.js b/server/boot/redirects.js
index 8c622cb501..b07ac3b13e 100644
--- a/server/boot/redirects.js
+++ b/server/boot/redirects.js
@@ -18,5 +18,13 @@ module.exports = function(app) {
     );
   });
 
+  router.get('/learn-to-code', function(req, res) {
+    res.redirect(301, '/map');
+  });
+
+  router.get('/about', function(req, res) {
+    res.redirect(301, '/map');
+  });
+
   app.use(router);
 };

From ccc29b7fcb3321aedab877d984c71871b2a8e54f Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 19 Jun 2015 17:26:04 -0700
Subject: [PATCH 53/54] improve upon @lemonyandrew pull request

---
 .../coursewares/coursewaresJSFramework_0.0.6.js | 11 +++++++----
 public/js/main_0.0.2.js                         |  2 ++
 server/views/coursewares/showBonfire.jade       | 17 ++++++++++++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
index 53204220f6..16073e2554 100644
--- a/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
+++ b/public/js/lib/coursewares/coursewaresJSFramework_0.0.6.js
@@ -45,8 +45,8 @@ editor.setOption("extraKeys", {
 	localBonfire: singleton object that contains properties and methods related to
 		dealing with the localStorage system.
 	The keys work off of the variable challenge_name to make unique identifiers per bonfire
-	
-	Two extra functionalities: 
+
+	Two extra functionalities:
 	Added anonymous version checking system incase of future updates to the system
 	Added keyup listener to editor(myCodeMirror) so the last update has been saved to storage
 */
@@ -81,7 +81,6 @@ localBonfire.updateStorage = function(){
 		}
 	}
 	localBonfire.updateTimeoutId = null;
-	console.log('updated!');
 };
 // ANONYMOUS 1 TIME UPDATE VERSION
 (function(){
@@ -96,7 +95,7 @@ localBonfire.updateStorage = function(){
 	}
 })();
 
-editor.on('keyup', function(codMir, event){ 
+editor.on('keyup', function(codMir, event){
 	window.clearTimeout(localBonfire.updateTimeoutId);
 	localBonfire.updateTimeoutId = window.setTimeout(localBonfire.updateStorage, localBonfire.updateWait);
 });
@@ -106,6 +105,10 @@ if (attempts) {
   attempts = 0;
 }
 
+var resetEditor = function() {
+  editor.setValue(allSeeds);
+  localBonfire.updateStorage();
+};
 
 var codeOutput = CodeMirror.fromTextArea(document.getElementById("codeOutput"), {
   lineNumbers: false,
diff --git a/public/js/main_0.0.2.js b/public/js/main_0.0.2.js
index 65ec9f170c..7fce4bdaba 100644
--- a/public/js/main_0.0.2.js
+++ b/public/js/main_0.0.2.js
@@ -331,6 +331,8 @@ $(document).ready(function() {
 
   $('#story-submit').on('click', storySubmitButtonHandler);
 
+  $('#reset-button').on('click', resetEditor);
+
   var commentSubmitButtonHandler = function commentSubmitButtonHandler() {
     $('#comment-button').unbind('click');
     var data = $('#comment-box').val();
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index 8ca3e962e1..c28f20e322 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -88,6 +88,12 @@ block content
             if (user && user.sentSlackInvite)
                 .button-spacer
                 .btn-group.input-group.btn-group-justified
+                    label.btn.btn-success#trigger-help-modal
+                        i.fa.fa-refresh
+                            | &nbsp; Reset
+                    label.btn.btn-success#trigger-help-modal
+                        i.fa.fa-refresh
+                            | &nbsp; Reset
                     label.btn.btn-success#trigger-help-modal
                         i.fa.fa-medkit
                             | &nbsp; Help
@@ -119,7 +125,7 @@ block content
                 form.code
                     .form-group.codeMirrorView
                         textarea#codeEditor(autofocus=true, style='display: none;')
-                script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.5.js')
+                script(src='/js/lib/coursewares/coursewaresJSFramework_0.0.6.js')
 
     #complete-courseware-dialog.modal(tabindex='-1')
         .modal-dialog.animated.zoomIn.fast-animation
@@ -140,6 +146,15 @@ block content
                                     = phrase
                     else
                         a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
+    #reset-modal.modal(tabindex='-1')
+        .modal-dialog.animated.fadeInUp.fast-animation
+            .modal-content
+                .modal-header.challenge-list-header Clear your code?
+                    a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
+                .modal-body
+                    h3 This will restore your code editor to its original state.
+                    a.btn.btn-lg.btn-info.btn-block#reset-button(href='#', data-dismiss='modal', aria-hidden='true') Clear my code
+                    a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
     include ../partials/challenge-modals
     script.
         var MDNlinks = !{JSON.stringify(MDNlinks)};

From 50a0ad3595588244c172226caff3d5f5c85a437d Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Sat, 20 Jun 2015 00:36:28 -0700
Subject: [PATCH 54/54] fix use gt not $gt closes #1022

---
 server/boot/nonprofits.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/boot/nonprofits.js b/server/boot/nonprofits.js
index 988ded5f84..1d16e76b74 100644
--- a/server/boot/nonprofits.js
+++ b/server/boot/nonprofits.js
@@ -9,7 +9,7 @@ module.exports = function(app) {
 
   function nonprofitsDirectory(req, res, next) {
     Nonprofit.find(
-      { where: { estimatedHours: { $gt: 0 } } },
+      { where: { estimatedHours: { gt: 0 } } },
       function(err, nonprofits) {
         if (err) { return next(err); }