attempt at merge

1 files changed, 11 insertions, 0 deletions

diff --git a/bucky/app/pages.js b/bucky/app/pages.js
index 7f666be..5d8551e 100644
--- a/bucky/app/pages.js
+++ b/bucky/app/pages.js
@@ -73,6 +73,17 @@ function route (app){
       res.render("pages/profile_form", {title: "edit your profile"})
     })
 
+  app.get("/users",
+    middleware.ensureAuthenticated,
+    function(req, res){
+      res.render("pages/users", {})
+    })
+  app.get("/users/all",
+    middleware.ensureAuthenticated,
+    function(req, res){
+      res.render("pages/users", {})
+    })
+
   app.get("/search/",
     middleware.ensureAuthenticated,
     function(req, res){