diff --git a/css/index.css b/css/index.css
index 4e19e97..72df58e 100644
--- a/css/index.css
+++ b/css/index.css
@@ -15,11 +15,20 @@ body{
 
 }
 
-a{
-	color: #999;
+a {
+<<<<<<< HEAD
+	color: #000;
 }
+
+a:hover{
+	color: #fff;
+=======
+	color: #999999;
+}
+
 a:hover{
-	color: #ddd;
+	color: #dddddd;
+>>>>>>> master
 }
 
 #intro_container, #outro_container{
@@ -108,11 +117,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 +132,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 +145,4 @@ span[cartoon]:hover{
 	top:-20px;
 	left:140px;
 
-}
\ No newline at end of file
+}