Resolve merge conflicts

app.js

@@ -500,6 +500,8 @@ app.get('/api/blogger', resourcesController.bloggerCalls);
 
 app.get('/api/trello', resourcesController.trelloCalls);
 
+app.get('/api/codepen/twitter/:screenName', resourcesController.codepenResources.twitter);
+
 /**
  * Bonfire related routes
  */

config/secrets.js

@@ -37,8 +37,10 @@ module.exports = {
   },
 
   twitter: {
-    consumerKey: process.env.TWITTER_KEY,
-    consumerSecret: process.env.TWITTER_SECRET,
+    consumerKey:      process.env.TWITTER_KEY,
+    consumerSecret:   process.env.TWITTER_SECRET,
+    token:            process.env.TWITTER_TOKEN,
+    tokenSecret:      process.env.TWITTER_TOKEN_SECRET,
     callbackURL: '/auth/twitter/callback',
     passReqToCallback: true
   },

controllers/resources.js

@@ -14,6 +14,7 @@ var async = require('async'),
   coursewares = require('../seed_data/coursewares.json'),
   fieldGuides = require('../seed_data/field-guides.json'),
   moment = require('moment'),
+  Twit = require('twit'),
   https = require('https'),
   debug = require('debug')('freecc:cntr:resources'),
   cheerio = require('cheerio'),
@@ -495,5 +496,37 @@ module.exports = {
         cb();
       });
     }
+  },
+  codepenResources: {
+    twitter: function(req, res) {
+      // sends out random tweets about javascript
+      var T = new Twit({
+        consumer_key:         secrets.twitter.consumerKey,
+        consumer_secret:      secrets.twitter.consumerSecret,
+        access_token:         secrets.twitter.token,
+        access_token_secret:  secrets.twitter.tokenSecret
+      });
+
+      console.log(req.params);
+
+      if (req.params.screenName) {
+        screenName = req.params.screenName;
+      } else {
+        screenName = 'freecodecamp';
+      }
+
+      T.get('statuses/user_timeline', {screen_name: screenName, count:10}, function(err, data, response) {
+        return res.json(data);
+      });
+    },
+    twitterFCCStream: function() {
+      // sends out a tweet stream from FCC's account
+    },
+    twitch: function() {
+      // exports information from the twitch account
+    },
+    slack: function() {
+
+    }
   }
 };