Merge pull request #2 from gregaubs/homepage

rfc
gregaubs · Jan 28, 2015 · b1adb51 · b1adb51
2 parents 8d53fb7 + 9e9f09d
commit b1adb51
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -14,6 +14,8 @@ <h1>  Demo Merge Conflicts  </h1>
   Greg  and Amil  asdlfsdddfsd
 </p>
 
+<p> Amil Amil Amil </p>
+
 <p>
 	askfjsdfklsajklfdjfklsdjfsdlkjsdfklsdjklsjadklfjklasdjfklasdfjsdklfjdklafjdklfsadjfklsdjksldj Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
 	tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,