resolve merge conflict, favoring upstream

controllers/courseware.js

@@ -259,14 +259,18 @@ exports.completedCourseware = function (req, res, next) {
     req.user.uncompletedCoursewares.splice(index, 1);
   }
 
-  req.user.save(function (err, user, next) {
+exports.completedBasejump = function (req, res, next) {
-    if (err) {
+    var isCompletedWith = req.body.bonfireInfo.completedWith || undefined;
-      return next(err);
+    var isCompletedDate = Math.round(+new Date());
+    var coursewareHash = req.body.coursewareInfo.coursewareHash;
+    var solutionLink = req.body.coursewareInfo.solutionLink;
+    if(!solutionLink) {
+        // flash error and redirect
     }
     if (user) {
       res.send(true);
     }
-  });
+  };
 };
 
 exports.completedZiplineOrBasejump = function (req, res, next) {

seed_data/ziplines.json

@@ -1,10 +0,0 @@
-[
-  {
-    "name": "Status Checker",
-    "picture": "",
-    "video": "",
-    "gitHubLink": "https://github.com/FreeCodeCamp/ZiplineStatusChecker",
-    "demoLink": "",
-    "details": []
-  }
-]

views/coursewares/showJS.jade

@@ -49,6 +49,7 @@ block content
                     var challengeName = !{JSON.stringify(name)};
                     var passedCoursewareName = challengeName;
                     var started = Math.floor(Date.now());
+
         .col-xs-12.col-sm-12.col-md-8
             #mainEditorPanel
                 form.code