Merge branch 'master' of ssh://khuhub.khu.ac.kr:12959/2017104024/TermProject_KakaoBot

@@ -6,7 +6,7 @@ var request = require('request');
 var client_id = 'is216aNtQ6QLNkWW03bc';
 var client_id = 'is216aNtQ6QLNkWW03bc';
 var client_secret = 'Ot0BMdWXOJ';
 var client_secret = 'Ot0BMdWXOJ';
 
 
-router.use(bodyparser.urlencoded({extended: false}));
+router.use(bodyparser.urlencoded({extended: true}));
 router.use(bodyparser.json());
 router.use(bodyparser.json());
 
 
 router.post('/', function(req, res, next) {
 router.post('/', function(req, res, next) {
@@ -78,6 +78,10 @@ router.post('/', function(req, res, next) {
 
 
       break;
       break;
      }
      }
+<<<<<<< HEAD
+=======
+ res.json(msg);
+>>>>>>> ae1136a7f2944d983ded52428ee21aad50aed1d9
 });
 });
 
 
 module.exports = router;
 module.exports = router;