Merge branch master

first-page.md

@@ -11,5 +11,5 @@ ok i can pull
 
 and what about conflicts ?
 
-
+here is what would cause a conflict hehe.