Resolved merge conflict

Author: LeaVerou

index.html

@@ -38,13 +38,12 @@ <h1>CSS3 Patterns Gallery</h1>
 #36c;
 background-size: 15px 30px" title="Half-Rombes" data-author="Valentin Agachi" data-author-url="http://agachi.name/"></li>
 
-	<li style="background:
-linear-gradient(45deg, #92baac 45px, transparent 45px),
+		<li style="background:
 linear-gradient(45deg, #92baac 45px, transparent 45px)64px 64px,
-linear-gradient(225deg, transparent 46px, #e1ebbd 46px, #e1ebbd 91px, transparent 91px),
+linear-gradient(45deg, #92baac 45px, transparent 45px,transparent 91px, #e1ebbd 91px, #e1ebbd 135px, transparent 135px),
 linear-gradient(-45deg, #92baac 23px, transparent 23px, transparent 68px,#92baac 68px,#92baac 113px,transparent 113px,transparent 158px,#92baac 158px);
 background-color:#e1ebbd;
-background-size: 128px 128px" title="Arrows" data-author="Jeroen Franse" data-author-url="http://twitter.com/jroenf"></li>
+background-size: 128px 128px;" title="Arrows" data-author="Jeroen Franse" data-author-url="http://twitter.com/jroenf"></li>
 
 	<li style="background: 
 linear-gradient(135deg, #ECEDDC 25%, transparent 25%) -50px 0,