Resolve merge conflicts

app.js

@@ -81,7 +81,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'
@@ -312,9 +311,6 @@ app.get('/nodeschool-challenges', function(req, res) {
 });
 
 
-app.get('/news', function(req, res) {
-  res.redirect(301, '/stories/hot');
-});
 app.get('/learn-to-code', challengeMapController.challengeMap);
 app.get('/about', function(req, res) {
   res.redirect(301, '/map');
@@ -437,13 +433,6 @@ app.get(
   storyController.recentJSON
 );
 
-app.get(
-  '/stories/',
-  function(req, res) {
-    res.redirect(302, '/stories/hot');
-  }
-);
-
 app.get(
   '/stories/comments/:id',
   storyController.comments
@@ -485,28 +474,17 @@ app.post(
 );
 
 app.get(
-  '/stories/hot',
+  '/news/',
   storyController.hot
 );
 
-app.get(
-  '/stories/recent',
-  storyController.recent
-);
-
-
-app.get(
-  '/stories/search',
-  storyController.search
-);
-
 app.post(
   '/stories/search',
   storyController.getStories
 );
 
 app.get(
-  '/stories/:storyName',
+  '/news/:storyName',
   storyController.returnIndividualStory
 );