Merged conflict

3 files changed, 1 insertions, 43 deletions

diff --git a/assets/css/creative.css b/assets/css/creative.css
index 1f9012c..714af8b 100644
--- a/assets/css/creative.css
+++ b/assets/css/creative.css
@@ -146,48 +146,6 @@ footer .navbar-default .affix .nav>li>a:focus {
     color: #222;
 }
 
-/*@media(min-width:768px) {
-    footer .navbar-default {
-        border-color: rgba(255,255,255,.3);
-        background-color: #333333;
-    }
-
-    footer .navbar-default .navbar-header .navbar-brand {
-        color: rgba(255,255,255,.7);
-    }
-
-    footer .navbar-default .navbar-header .navbar-brand:hover ,
-    footer .navbar-default .navbar-header .navbar-brand:focus {
-        color: #fff;
-    }
-
-    footer .navbar-default .nav > li>a,
-    footer .navbar-default .nav>li>a:focus {
-        color: rgba(255,255,255,.7);
-    }
-
-    footer .navbar-default .nav > li>a:hover,
-    footer .navbar-default .nav>li>a:focus:hover {
-        color: #fff;
-    }
-
-    footer .navbar-default .affix {
-        border-color: rgba(34,34,34,.05);
-        background-color: #fff;
-    }
-
-    footer .navbar-default .affix .navbar-header .navbar-brand {
-        font-size: 14px;
-    }
-
-   
-    footer .navbar-default .affix .nav > li>a,
-    footer .navbar-default .affix .nav>li>a:focus {
-        color: #222;
-    }
-}*/
-
-
 header {
     position: relative;
     width: 100%;
diff --git a/idea.pdf b/idea.pdf
index 8a483ef..1aaafd3 100644
--- a/idea.pdf
+++ b/idea.pdf
diff --git a/index.html b/index.html
index e811967..91cffdf 100644
--- a/index.html
+++ b/index.html
@@ -86,7 +86,7 @@
 	</nav>
 
 	<header>
-		<div class="header-content"
+		<div class="header-content">
 			<section class="header-content-inner">
 				<p><strong>The solutions to all your problems</strong></p>
 				<hr> <!-- Divider -->