From df160cbebc29b35f6d2463b29bfc9df38ef54120 Mon Sep 17 00:00:00 2001
From: Loc <locnguyen3039@gmail.com>
Date: Thu, 9 May 2019 16:18:26 +0700
Subject: [PATCH] add cards

---
 index.html | 20 ++++----------------
 style.css  |  2 --
 2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/index.html b/index.html
index f90255b..336d8ac 100644
--- a/index.html
+++ b/index.html
@@ -19,15 +19,7 @@
 </head>
 
 <body>
-<<<<<<< HEAD
-    <!--[if lt IE 7]>
-            <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-
-    <nav class="bg-black fixed-top">
-=======
     <nav class="bg-black fixed-top row">
->>>>>>> cc555c3489ae38ebda410d7c134b9c099acf240c
         <div class="container navbar-nav navbar-light navbar-expand-lg py-2">
             <a href="#" class="navbar-brand"><img src="img/platypus-logo.png" alt="Startup-logo" height="45px"></a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
@@ -51,15 +43,11 @@
     </nav>
     <header class="">
         <div class="container">
-<<<<<<< HEAD
-
-        </div>
-=======
             <div class="header-style">
-            <h1 class="header-title">Be a Hero! Resucue a Platypus.</h1>
-            <h4 class="header-subtitle">"Because the platypus both lays eggs and produces milk, <br/> it's one of the few animals that can make it's own custard."</h4>
-        </div></div>
->>>>>>> cc555c3489ae38ebda410d7c134b9c099acf240c
+                <h1 class="header-title">Be a Hero! Resucue a Platypus.</h1>
+                <h4 class="header-subtitle">"Because the platypus both lays eggs and produces milk, <br/> it's one of the few animals that can make it's own custard."</h4>
+            </div>
+        </div>
     </header>
     <section class="" style="background-color: #D86000">
         <div class="environment container py-3">
diff --git a/style.css b/style.css
index 4417fba..b6615c3 100644
--- a/style.css
+++ b/style.css
@@ -13,8 +13,6 @@ body {
 }
 
 nav {
-    background-color: ;
-    min-height: ;
     color: white;
 }
 
