From 19a560a976a0e171484016913ed10ded9ccf28bb Mon Sep 17 00:00:00 2001
From: Briana Swift <brianamarie@github.com>
Date: Mon, 3 Apr 2017 10:07:17 -0500
Subject: [PATCH 1/3] change URL color

---
 css/index.css | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/css/index.css b/css/index.css
index 4e19e97..6c4b504 100644
--- a/css/index.css
+++ b/css/index.css
@@ -16,10 +16,10 @@ body{
 }
 
 a{
-	color: #999;
+	color: #000;
 }
 a:hover{
-	color: #ddd;
+	color: #fff;
 }
 
 #intro_container, #outro_container{
@@ -108,11 +108,11 @@ span[cartoon]:hover{
 
 }
 #cartoon_arrow{
-	
+
 	display: block;
 
-	width: 0; 
-	height: 0; 
+	width: 0;
+	height: 0;
 	border-left: 10px solid transparent;
 	border-right: 10px solid transparent;
 	border-bottom: 20px solid #fff;
@@ -123,11 +123,11 @@ span[cartoon]:hover{
 
 }
 #cartoon_arrow[flipped=true]{
-	
+
 	display: block;
 
-	width: 0; 
-	height: 0; 
+	width: 0;
+	height: 0;
 	border-left: 10px solid transparent;
 	border-right: 10px solid transparent;
 	border-bottom: 20px solid #fff;
@@ -136,4 +136,4 @@ span[cartoon]:hover{
 	top:-20px;
 	left:140px;
 
-}
\ No newline at end of file
+}

From 2735ed40bdadc842dcf703d0cec3429f86b8ff4b Mon Sep 17 00:00:00 2001
From: Briana Swift <brianamarie@github.com>
Date: Mon, 3 Apr 2017 10:08:29 -0500
Subject: [PATCH 2/3] change URL colors

---
 css/index.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/css/index.css b/css/index.css
index 6c4b504..b79d306 100644
--- a/css/index.css
+++ b/css/index.css
@@ -16,10 +16,17 @@ body{
 }
 
 a{
+<<<<<<< HEAD
 	color: #000;
 }
 a:hover{
 	color: #fff;
+=======
+	color: #999999;
+}
+a:hover{
+	color: #dddddd;
+>>>>>>> master
 }
 
 #intro_container, #outro_container{

From 6b50ac7e98a43288737bfd3503af97315fe4de8e Mon Sep 17 00:00:00 2001
From: Briana Swift <brianamarie@github.com>
Date: Mon, 3 Apr 2017 10:10:22 -0500
Subject: [PATCH 3/3] add spacing in url css

---
 css/index.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/css/index.css b/css/index.css
index b79d306..72df58e 100644
--- a/css/index.css
+++ b/css/index.css
@@ -15,15 +15,17 @@ body{
 
 }
 
-a{
+a {
 <<<<<<< HEAD
 	color: #000;
 }
+
 a:hover{
 	color: #fff;
 =======
 	color: #999999;
 }
+
 a:hover{
 	color: #dddddd;
 >>>>>>> master