Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp

Conflicts:
	app.js

package.json

@@ -56,6 +56,7 @@
     "passport-local": "^1.0.0",
     "passport-oauth": "^1.0.0",
     "passport-twitter": "^1.0.2",
+    "ramda": "^0.10.0",
     "request": "^2.49.0",
     "sitemap": "^0.7.4",
     "uglify-js": "^2.4.15",

public/js/lib/bonfire/bonfireInit.js

@@ -67,7 +67,7 @@ var requests;
 // (re)initializes the plugin
 var reset = function() {
     requests = 0;
-    plugin = new jailed.Plugin(path+'plugin_v0.1.2.js', api);
+    plugin = new jailed.Plugin(path+'plugin_v0.1.3.js', api);
     plugin.whenDisconnected( function() {
         // give some time to handle the last responce
         setTimeout( function() {

public/js/lib/bonfire/plugin_v0.1.3.js

@@ -22,6 +22,16 @@ var run = function(code) {
 
 // protects even the worker scope from being accessed
 var runHidden = function(code) {
+
+    var importScript = function(url) {
+        var error = null;
+        try {
+            importScripts(url);
+        } catch (e) {
+            error = e;
+            console.log('Unable to load ramda!');
+        }
+    };
     var indexedDB = null;
     var location = null;
     var navigator = null;
@@ -44,7 +54,9 @@ var runHidden = function(code) {
     var dump = null;
     var onoffline = null;
     var ononline = null;
-    var importScripts = null;
+    importScript("https://cdn.jsdelivr.net/ramda/0.10.0/ramda.min.js");
+    var _ = R;
+
 
     return eval(code);
 }

public/js/lib/ramda/ramda.js

@@ -0,0 +1,4 @@
+/**
+ * Created by nathanleniz on 2/21/15.
+ */
+var R = require('ramda');

views/bonfire/show.jade

@@ -15,6 +15,7 @@ block content
     script(src='/js/lib/codemirror/mode/javascript/javascript.js')
     script(src='/js/lib/jailed/jailed.js')
     script(src='/js/lib/bonfire/bonfireInit.js')
+    script(src="https://cdn.jsdelivr.net/ramda/0.10.0/ramda.min.js")
 
 
     .row
@@ -91,6 +92,7 @@ block content
                     var passedBonfireHash = !{JSON.stringify(bonfireHash)};
                     var challengeName = !{JSON.stringify(name)};
                     var started = Math.floor(Date.now() / 1000);
+                    var _ = R;
         .col-xs-12.col-sm-12.col-md-8
             #mainEditorPanel
                 form.code