Merge remote-tracking branch 'origin/ourMaster' into sangho

client/src/Pages/Payment.js

@@ -226,7 +226,7 @@ function Payment({ match, location }) {
     }
 
     return (
-        <Container>
+        <Container className="mb-5">
             <h3 className="my-5 font-weight-bold text-center">주문/결제</h3>
             <div>
                 <h5 className="font-weight-bold py-3 border-top border-bottom text-center" style={{ background: '#F7F3F3' }}>주문자 정보</h5>

client/src/Pages/ShoppingCart.js

@@ -95,7 +95,7 @@ function ShoppingCart() {
     }
 
     return (
-        <Container className="justify-content-center">
+        <Container className="justify-content-center mb-5">
             <h1 className="my-5 font-weight-bold text-center">장바구니</h1>
             <div>
                 <h4 className="font-weight-bold py-3 border-top border-bottom text-center" style={{ background: '#F7F3F3' }}>주문상품정보</h4>

data/DB json/products.json

@@ -7,7 +7,6 @@
     "FREE"
   ],
   "colors": [
-    "undefined",
     "beige"
   ],
   "sub_category": [