Merge branch 'master' of https://github.com/frankcash/HackerQueue

Conflicts:
	app.js

app.js

@@ -302,6 +302,14 @@ app.use(express.logger('dev'))
 
 app.use(express.static(__dirname + '/public'))
 
+
+app.get('/old', function (req, res) { //get index and renders it
+  res.render('index',
+		  { title : 'Home' }
+			  )
+})
+
+
 app.get('/', function (req, res) {
   res.render('test',
       { title : 'Home' }

views/layout.jade

@@ -32,7 +32,7 @@ html
       <input class="check" type="checkbox" id="rprogBox" ng-model="rprog" name="check" checked/>
       <label class = "box"><strong>/r/programming</strong></label>
       </div>
-
+      
 
     #container