Merge branch 'master' into challenges

Conflicts: app.js
2014-12-16 10:45:59 -08:00
parent 7dc1b2fc9b b4914fa497
commit 5497987506
4 changed files with 45 additions and 1 deletions
--- a/controllers/resources.js
+++ b/controllers/resources.js
@ -27,6 +27,18 @@ exports.jqueryExercises = function(req, res) {
    });
 }

+exports.livePairProgramming = function(req, res) {
+    res.render('live-pair-programming',  {
+        title: 'Live Pair Programming'
+    });
+}
+
+exports.javaScriptInYourInbox = function(req, res) {
+    res.render('javascript-in-your-inbox',  {
+        title: 'JavaScript in your Inbox'
+    });
+}
+
 exports.programmerInterviewQuestionsApp = function(req, res) {
    res.render('programmer-interview-questions-app',  {
        title: 'Programmer Interview Questions App'