fix upstream conflict

Author: kevinSuttle

about.html

@@ -3,7 +3,9 @@
 ---
 
 <article class="article-bio">
-  <h1 class="article-title">Hello. I'm Kevin Suttle.</h1>
+
+  <h1 class="article-title">Designer. Developer. Writer. Presenter.</h1>
+
 
   <p>I have made a career out of wielding technology as a design tool. Using science and code to improve experiences for people is what gets me up in the morning, and keeps me up at night.</p>
 
@@ -56,9 +58,8 @@ <h2>URLs</h2>
     <li><a href="https://twitter.com/kevinsuttle">Twitter.</a> Stream of consciousness.</li>
     <li><a href="https://dribbble.com/kevinsuttle">Dribbble</a>. Visual design and UI work samples</li>
   </ul>
-  
-
+  	
 <h2>Get in contact</h2>
-<p>Interested in working with me? <a href="mailto:kevin@suttle.email">Let's talk</a>.</p>
+	<p>Interested in working with me? <a href="mailto:kevin@suttle.email">Let's talk</a>.</p>
 
 </article>