From d96de8a103bca03c8f4113824b96df1ee856a7b0 Mon Sep 17 00:00:00 2001
From: Christie Lincoln <44656240+clincoln8@users.noreply.github.com>
Date: Thu, 5 Nov 2020 16:50:39 -0800
Subject: [PATCH 1/2] hacked

---
 index.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index 6156a36..30b7e62 100644
--- a/index.html
+++ b/index.html
@@ -16,19 +16,19 @@ <h1 style="color:blue;">USC-PiB Github Workshop FA20</h1>
 		<h4>Sign in below!</h4>
 
 		<!-- Name and message templates -->
-		<p style="background-color:darkgreen;color:white">Christie L says: hello world!</p>
-		<p>Sophia L says: i love octocat</p>
-        	<p style="background-color:darkblue;color:white">Chau V says: yoink</p>
-		<p>Daniel L says: coming for part 2!</p>
-		<p>Anthony C says: coming for part 2!</p>
-		<p>Daniel Z says: coming for part 2!</p>
+		<p style="background-color:darkgreen;color:white">Christie L says: hacked</p>
+		<p>Sophia L says: hacked</p>
+        	<p style="background-color:darkblue;color:white">Chau V says: hacked</p>
+		<p>Daniel L says: hacked</p>
+		<p>Anthony C says: hacked</p>
+		<p>Daniel Z says: hacked</p>
 
 		<!-- Add your name and a fun message below following the templates, pick your own background and text colors -->
     <p> Daniel G says: hello world!</p>	
-		<p style="background-color:darkred;color:white">Noah D says: Hello? Is this thing on?!?!</p>   	
-		<p style="background-color:rgb(76, 145, 76);color:white">Brian says: hello world!</p>
-		<p style="background-color:darkblue;color:white">Fred Y says: Hello!</p>
-		<p style="background-color:#8dEbd4;">Faith L says: Hi!</p>
-		<p style="background-color:pink;color:white">Sharon J says: my favorite marvin gaye song is "let's git it on</p>
+		<p style="background-color:darkred;color:white">Noah D says: hacked</p>   	
+		<p style="background-color:rgb(76, 145, 76);color:white">Brian says: hacked</p>
+		<p style="background-color:darkblue;color:white">Fred Y says: hacked</p>
+		<p style="background-color:#8dEbd4;">Faith L says: hacked</p>
+		<p style="background-color:pink;color:white">Sharon J says: hacked</p>
 	</body>
 </html>

From 1b54dfa624eefff2384f951a8ca1d873a2e5a4ce Mon Sep 17 00:00:00 2001
From: Christie Lincoln <clincoln@ucsd.edu>
Date: Thu, 5 Nov 2020 17:04:30 -0800
Subject: [PATCH 2/2] resolved conflict

---
 index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 30b7e62..15a5cbd 100644
--- a/index.html
+++ b/index.html
@@ -16,12 +16,12 @@ <h1 style="color:blue;">USC-PiB Github Workshop FA20</h1>
 		<h4>Sign in below!</h4>
 
 		<!-- Name and message templates -->
-		<p style="background-color:darkgreen;color:white">Christie L says: hacked</p>
-		<p>Sophia L says: hacked</p>
-        	<p style="background-color:darkblue;color:white">Chau V says: hacked</p>
-		<p>Daniel L says: hacked</p>
-		<p>Anthony C says: hacked</p>
-		<p>Daniel Z says: hacked</p>
+		<p style="background-color:darkgreen;color:white">Christie L says: i love my dog</p>
+		<p>Sophia L says: i love octocat</p>
+        	<p style="background-color:darkblue;color:white">Chau V says: yoink</p>
+		<p>Daniel L says: coming for part 2!</p>
+		<p>Anthony C says: coming for part 2!</p>
+		<p>Daniel Z says: coming for part 2!</p>
 
 		<!-- Add your name and a fun message below following the templates, pick your own background and text colors -->
     <p> Daniel G says: hello world!</p>