Resolve merge conflicts using Webstorm's merge integration tool. v2

app.js

@@ -370,11 +370,11 @@ app.post(
   passportConf.isAuthenticated,
   contactController.postDoneWithFirst100Hours
 );
-app.get(
-  '/nonprofit-project-instructions',
-  passportConf.isAuthenticated,
-  resourcesController.nonprofitProjectInstructions
-);
+//app.get(
+//  '/nonprofit-project-instructions',
+//  passportConf.isAuthenticated,
+//  resourcesController.nonprofitProjectInstructions
+//);
 app.post(
   '/update-progress',
   passportConf.isAuthenticated,
@@ -521,18 +521,6 @@ app.post(
   storyController.upvote
 );
 
-/**
- * Challenge related routes
- */
-app.get(
-  '/challenges/',
-  challengesController.returnNextChallenge
-);
-app.get(
-  '/challenges/:challengeNumber',
-  challengesController.returnChallenge
-);
-
 app.all('/account', passportConf.isAuthenticated);
 
 app.get('/account/api', userController.getAccountAngular);

controllers/resources.js

@@ -149,13 +149,6 @@ module.exports = {
     var date1 = new Date("10/15/2014");
     var date2 = new Date();
 
-
-    livePairProgramming: function(req, res) {
-        res.render('resources/live-pair-programming', {
-            title: 'Live Pair Programming'
-        });
-    },
-
     var timeDiff = Math.abs(date2.getTime() - date1.getTime());
     var daysRunning = Math.ceil(timeDiff / (1000 * 3600 * 24));
     var announcements = resources.announcements;

controllers/story.js

@@ -359,16 +359,6 @@ exports.storySubmission = function(req, res, next) {
     });
 };
 
-  story.save(function(err) {
-    if (err) {
-      return next(err);
-    }
-    res.send(JSON.stringify({
-      storyLink: story.storyLink.replace(/\s/g, '-').toLowerCase()
-    }));
-  });
-};
-
 exports.commentSubmit = function(req, res, next) {
   var data = req.body.data;
   if (req.user._id.toString() !== data.author.userId.toString()) {

gulpfile.js

@@ -68,4 +68,4 @@ gulp.task('lint', function() {
   .pipe(eslint.format());
 });
 
-gulp.task('default', ['lint', 'serve', 'sync']);
+gulp.task('default', ['serve', 'sync']);