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);