Merge branch 'master' into challenges

Conflicts:
	app.js

app.js

@@ -131,6 +131,8 @@ app.get(
 app.get('/learn-to-code', resourcesController.learnToCode);
 app.get('/privacy', resourcesController.privacy);
 app.get('/jquery-exercises', resourcesController.jqueryExercises);
+app.get('/live-pair-programming', resourcesController.livePairProgramming);
+app.get('/javascript-in-your-inbox', resourcesController.javaScriptInYourInbox);
 app.get('/chromebook', resourcesController.chromebook);
 app.get('/pair-program-with-team-viewer', resourcesController.pairProgramWithTeamViewer);
 app.get('/done-with-first-100-hours', resourcesController.doneWithFirst100Hours);

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'

views/javascript-in-your-inbox.jade

@@ -0,0 +1,12 @@
+extends layout
+block content
+    .jumbotron.negative-15.text-center
+        h1.hug-top Win a Chromebook
+        h2 Sign up for Inbox.js - JavaScript challenges in your inbox - and enter to win a Chromebook!
+        img.image-responsive(src="https://s3.amazonaws.com/freecodecamp/chromebook.jpg" alt="HP Chromebook 11")
+        script(src='//widget-prime.rafflecopter.com/launch.js')
+        a#rcwidget_a7khonhd.rcptr(href='http://www.rafflecopter.com/rafl/display/d70901b10/', rel='nofollow', data-raflid='d70901b10', data-theme='classic', data-template='') a Rafflecopter giveaway
+        .animated.zoomInDown.delay-10
+            p Finished signing up for the giveaway?
+            a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free)
+        br

views/live-pair-programming.jade

@@ -0,0 +1,18 @@
+extends layout
+block content
+    .jumbotron.negative-15.text-center
+        h1.hug-top Live Pair Programming
+        h2 Watch Quincy Larson and Berkeley Martinez pair program on CoderByte challenges live Tuesday, December 16 from 6 p.m. to 7 p.m., Pacific Standard Time.
+        h3 Check back here for details. And follow  
+            a(href='http://twitter.com/intent/user?screen_name=FreeCodeCamp' target='_blank') @FreeCodeCamp
+            | ,  
+            a(href='http://twitter.com/intent/user?screen_name=ossia' target='_blank') @ossia
+            |   and  
+            a(href='http://twitter.com/intent/user?screen_name=BerkeleyTrue' target='_blank') @BerkeleyTrue
+            |   on Twitter.
+        p Got 3 minutes? Watch this funny video about pair programming, then start learning to code with us!
+        .embed-responsive.embed-responsive-16by9
+            iframe.embed-responsive-item(width='560', height='315', src='//www.youtube.com/embed/dYBjVTMUQY0', frameborder='0', allowfullscreen='')
+        br
+        a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free)
+        br