diff --git a/great-idea-website/css/index.css b/great-idea-website/css/index.css
index 7766e7f18..2343dfe84 100644
--- a/great-idea-website/css/index.css
+++ b/great-idea-website/css/index.css
@@ -3,64 +3,355 @@
    License: none (public domain)
 */
 
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+<<<<<<< HEAD
 	margin: 0;
 	padding: 0;
 	border: 0;
 	font-size: 100%;
 	font: inherit;
 	vertical-align: baseline;
+=======
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
 }
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+<<<<<<< HEAD
 	display: block;
+=======
+  display: block;
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
 }
 body {
-	line-height: 1;
+  line-height: 1;
 }
-ol, ul {
+ol,
+ul {
+<<<<<<< HEAD
 	list-style: none;
 }
-blockquote, q {
+blockquote,
+q {
 	quotes: none;
+=======
+  list-style: none;
 }
-blockquote:before, blockquote:after,
-q:before, q:after {
+blockquote,
+q {
+  quotes: none;
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+<<<<<<< HEAD
 	content: '';
 	content: none;
+=======
+  content: '';
+  content: none;
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
 }
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+  border-collapse: collapse;
+  border-spacing: 0;
 }
 
 /* Set every element's box-sizing to border-box */
 * {
-    box-sizing: border-box;
+<<<<<<< HEAD
+	box-sizing: border-box;
+=======
+  box-sizing: border-box;
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
+}
+
+html,
+body {
+<<<<<<< HEAD
+	height: 100%;
+	font-family: 'Titillium Web', sans-serif;
+=======
+  height: 100%;
+  font-family: 'Titillium Web', sans-serif;
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
+}
+
+h1,
+h2,
+h3,
+h4,
+h5 {
+<<<<<<< HEAD
+	font-family: 'Bangers', cursive;
+	letter-spacing: 1px;
+	margin-bottom: 15px;
+=======
+  font-family: 'Bangers', cursive;
+  letter-spacing: 1px;
+  margin-bottom: 15px;
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
+}
+
+/* Your code starts here! */
+
+<<<<<<< HEAD
+.container {
+	width: 880px;
+	margin: 0 auto;
+}
+
+.container header {
+	position: relative;
+}
+
+.container header nav {
+	display: inline-block;
+	margin: 10px 0px;
+}
+
+.container header nav li {
+	display: inline;
+	padding: 0px 55px 0px 0px;
+}
+
+.container header nav li a {
+	text-decoration: none;
+	color: gray;
+}
+
+.container header nav li a:hover {
+	text-decoration: underline;
+}
+
+.container header .logo {
+	position: absolute;
+	right: 0px;
+}
+
+.container main .cta {
+	position: relative;
+	height: 500px;
+	width: 100%;
+}
+
+.container main .cta .cta-text {
+	display: inline-block;
+	font-size: 76px;
+	text-align: center;
+	margin: 120px 90px;
+}
+
+.container main .cta .cta-text h1 {
+	letter-spacing: 2px;
+}
+
+.container main .cta .cta-text a {
+	font-size: 18px;
+	text-decoration: none;
+	color: black;
+	background-color: white;
+	border: 1px solid black;
+	padding: 4px 50px;
+}
+
+.container main .cta .cta-text a:hover {
+	color: white;
+	background-color: black;
+}
+
+.container main .cta .cta-img {
+	position: absolute;
+	right: 0px;
+	margin: 60px 0;
+}
+
+main .top-content {
+	border-top: 1px solid black;
+}
+
+main .top-content .text-content {
+	display: inline-block;
+	width: 425px;
+	margin: 40px 10px 30px 0;
+}
+
+main .bottom-content {
+	border-bottom: 1px solid black;
+}
+
+main .bottom-content .text-content {
+	display: inline-block;
+	width: 280px;
+	margin: 30px 10px 40px 0;
+}
+
+main .contact {
+	margin: 30px 0;
+}
+
+footer {
+	text-align: center;
+}
+=======
+
+
+.menu {
+  display: inline-block;
+  text-align: left;
+  padding: 2px 15px;
+  margin: 5px 5px;
+}
+
+.logo {
+  display: inline-block;
+  text-align: right;
+  float: right;
+}
+
+img {
+  display: inline-block;
+}
+
+.box {
+  width: 200px;
+  height: 50px;
+  padding: 100px 100px 50px 50px;
+  text-align: center;
+  float: left;
+}
+
+.image {
+  padding: 50px 5px  100px 50px;
+}
+
+.box h1 {
+  font-size: 48px;
+}
+
+.wrapper {
+  display: block;
+	width: 960px;
+  align-content: center;
+}
+
+.image-wrapper {
+	margin: 40px;
+	display: inline-block;
+}
+
+.content-item {
+  float: right;
+	width: 47%;
 }
 
-html, body {
-    height: 100%;
-    font-family: 'Titillium Web', sans-serif;
+.content-item-three {
+	float: right;
+	width: 32%;
 }
 
-h1, h2, h3, h4, h5 {
-    font-family: 'Bangers', cursive;
-    letter-spacing: 1px;
-    margin-bottom: 15px;
+section {
+	margin-top: 20px;
+	margin-bottom: 20px;
+	padding-top: 20px;
+	padding-bottom: 20px;
 }
 
-/* Your code starts here! */
\ No newline at end of file
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
diff --git a/great-idea-website/index.html b/great-idea-website/index.html
index 92beabd65..b35c48381 100644
--- a/great-idea-website/index.html
+++ b/great-idea-website/index.html
@@ -1,63 +1,210 @@
-<!doctype html>
+<!DOCTYPE html>
 
 <html lang="en">
+<<<<<<< HEAD
+
 <head>
   <meta charset="utf-8">
+=======
+  <head>
+    <meta charset="utf-8" />
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697
 
-  <title>Great Idea!</title>
+    <title>Great Idea!</title>
 
-  <link href="https://fonts.googleapis.com/css?family=Bangers|Titillium+Web" rel="stylesheet">
-  <link rel="stylesheet" href="css/index.css">
+    <link
+      href="https://fonts.googleapis.com/css?family=Bangers|Titillium+Web"
+      rel="stylesheet"
+    />
+    <link rel="stylesheet" href="css/index.css" />
 
+<<<<<<< HEAD
   <!--[if lt IE 9]>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
-  <![endif]-->
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
+    <![endif]-->
 </head>
 
-  <body>
-
-  Services
-  Product
-  Vision
-  Features
-  About
-  Contact
-
-  <img class="logo" src="img/logo.png" alt="Great Idea! Company logo.">
-  Innovation
-  On
-  Demand
-
-  Get Started
-
-  <img src="img/header-img.png" alt="Image of a code snippet.">
-
-  Features
-  Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.
-
+<body>
+  <div class="container">
+    <header>
+      <nav>
+        <ul>
+          <li><a href="#">Services</a></li>
+          <li><a href="#">Product</a></li>
+          <li><a href="#">Vision</a></li>
+          <li><a href="#">Features</a></li>
+          <li><a href="#">About</a></li>
+          <li><a href="#">Contact</a></li>
+        </ul>
+      </nav>
+      <img class="logo" src="img/logo.png" alt="Great Idea! Company logo.">
+    </header>
+
+    <main>
+      <div class="cta">
+        <div class="cta-text">
+          <h1>Innovation<br>
+            On<br>
+            Demand</h1>
+          <p class="cta-button"><a href="#">Get Started</a></p>
+        </div>
+        <img class="cta-img" src="img/header-img.png" alt="Image of a code snippet.">
+      </div>
+      <div class="top-content">
+        <section class="text-content">
+          <h3>Features</h3>
+          <p>Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm
+            nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.</p>
+        </section>
+        <section class="text-content">
+          <h3>About</h3>
+          <p>Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm
+            nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.</p>
+        </section>
+      </div>
+      <img class="middle-img" src="img/mid-page-accent.jpg" alt="Image of code snippets across the screen">
+      <div class="bottom-content">
+        <section class="text-content">
+          <h3>Services</h3>
+          <p>Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm
+            nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.</p>
+        </section>
+        <section class="text-content">
+          <h3>Product</h3>
+          <p>Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm
+            nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.</p>
+        </section>
+        <section class="text-content">
+          <h3>Vision</h3>
+          <p>Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm
+            nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.</p>
+        </section>
+      </div>
+      <div class="contact">
+        <h3>Contact</h3>
+        <address>
+          123 Way 456 Street<br>
+          Somewhere, USA<br><br>
+          1 (888) 888-8888<br><br>
+          sales@greatidea.io
+        </address>
+      </div>
+    </main>
+
+    <footer>
+      <p>Copyright Great Idea! 2018</p>
+    </footer>
+  </div>
+</body>
+
+</html>
+=======
+    <!--[if lt IE 9]>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
+    <![endif]-->
+  </head>
 
-  About
-  Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.
-
-  <img class="middle-img" src="img/mid-page-accent.jpg" alt="Image of code snippets across the screen">
-  
-  Services
-  Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.
-
-
-  Product
-  Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.
-
-  Vision
-  Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.
-
-  Contact
-  123 Way 456 Street
-  Somewhere, USA
-  1 (888) 888-8888
-  sales@greatidea.io
-
-  Copyright Great Idea! 2018
-  
+  <body>
+    <div class="wrapper">
+      <header>
+        <nav class="menu">
+          <ul>
+            <li class="menu"><a href="#">Services</a></li>
+            <li class="menu"><a href="#">Product</a></li>
+            <li class="menu"><a href="#">Vision</a></li>
+            <li class="menu"><a href="#">Features</a></li>
+            <li class="menu"><a href="#">About</a></li>
+            <li class="menu"><a href="#">Contact</a></li>
+          </ul>
+        </nav>
+
+        <div class="logo">
+          <img class="" src="img/logo.png" alt="Great Idea! Company logo." />
+        </div>
+        <div class="box">
+          <h1>
+            Innovation<br />
+            On <br />
+            Demand
+          </h1>
+          <button>
+            Get Started
+          </button>
+        </div>
+        <div class="image">
+          <img src="img/header-img.png" alt="Image of a code snippet." />
+        </div>
+      </header>
+
+      <section>
+        <div class="content-item">
+          <h3>Features</h3>
+          <p>
+            Aliquam elementum magna eros, ac posuere elvit tempus et.
+            Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu
+            ornare nisl. Nullam convallis augue justo, at imperdiet metus
+            scelerisque quis.
+          </p>
+        </div>
+        <div class="content-item">
+          <h3>About</h3>
+          <p>
+            Aliquam elementum magna eros, ac posuere elvit tempus et.
+            Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu
+            ornare nisl. Nullam convallis augue justo, at imperdiet metus
+            scelerisque quis.
+          </p>
+        </div>
+
+        <div class="image-wrapper">
+          <img
+            class="middle-img"
+            src="img/mid-page-accent.jpg"
+            alt="Image of code snippets across the screen"
+          />
+        </div>
+
+        <div class="content-item-three">
+          <h3>Services</h3>
+          <p>
+            Aliquam elementum magna eros, ac posuere elvit tempus et.
+            Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu
+            ornare nisl. Nullam convallis augue justo, at imperdiet metus
+            scelerisque quis.
+          </p>
+        </div>
+        <div class="content-item-three">
+          <h3>Product</h3>
+          <p>
+            Aliquam elementum magna eros, ac posuere elvit tempus et.
+            Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu
+            ornare nisl. Nullam convallis augue justo, at imperdiet metus
+            scelerisque quis.
+          </p>
+        </div>
+        <div class="content-item-three">
+          <h3>Vision</h3>
+          <p>
+            Aliquam elementum magna eros, ac posuere elvit tempus et.
+            Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu
+            ornare nisl. Nullam convallis augue justo, at imperdiet metus
+            scelerisque quis.
+          </p>
+        </div>
+      </section>
+
+      <address>
+        <div>
+          <h3>Contact</h3>
+          <br />
+          123 Way 456 Street Somewhere, USA<br />
+          1 (888) 888-8888<br />
+          <i>sales@greatidea</i>
+        </div>
+      </address>
+
+      <footer>Copyright Great Idea! 2018</footer>
+    </div> <!--wrapper-->
   </body>
-</html>
\ No newline at end of file
+</html>
+>>>>>>> b875eff9feee9a4c1dbd1937b597e3a04271b697