Merge branch 'master' of http://khuhub.khu.ac.kr/2019102210/CultureGallery into master

 {
   "name": "culturegallery",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
+<<<<<<< HEAD
+=======
   "packages": {
     "": {
       "name": "culturegallery",
@@ -627,6 +629,7 @@
       }
     }
   },
+>>>>>>> fce0e2c2148edbd32673b720c8123f1b3aa99538
   "dependencies": {
     "accepts": {
       "version": "1.3.7",