fixed merge errors

demo.css

@@ -43,13 +43,4 @@ Contents:
 			article h1:nth-of-type(1){margin-top:0;text-align:center;border-bottom:2px solid #eee;padding:0 0 0.5em 0;}	
 			article h1:nth-of-type(1):before,
 			article h1:nth-of-type(1):after
-			{content:"-";}	           
-
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> gh-pages
-=======
->>>>>>> gh-pages
+			{content:"-";}	           

index.html

@@ -39,15 +39,7 @@ <h2>Front&ndash;End style guide</h2>
 				</hgroup>
 				<div id="intro">
 					<p>This repo is a basic set of  HTML5 tags and CSS styles (mainly structure) for the Tangent Snowball team to use for new projects.</p>
-<<<<<<< HEAD
-<<<<<<< HEAD
-					<p>It is not intended as a framework, but as a way to ensure we all work in loosely the same way.</p>  
-=======
 					<p>It is not intended as a framework, but as a way to ensure we all work in loosely the same way.</p>   
->>>>>>> gh-pages
-=======
-					<p>It is not intended as a framework, but as a way to ensure we all work in loosely the same way.</p>   
->>>>>>> gh-pages
 				</div>
 			</header>
 			<article id="sec-headings">
@@ -67,21 +59,12 @@ <h6>Heading 6</h6>
 			<article id="sec-images">
 				<h1>Images</h1>
 				<figure>
-<<<<<<< HEAD
-					<img src="site_assets/test_assets/large_image.jpg" alt="Large Image"/>
-					<figcaption>A basic image</figcaption>
-				</figure>
-				<figure> 
-					<a href="http://www.google.com" title="Visit Google">
-						<img src="site_assets/test_assets/large_image.jpg" alt="Large Image"/>
-=======
 					<img src="http://placekitten.com/570/300" alt="Large Image"/>
 					<figcaption>A basic image</figcaption>
 				</figure>
 				<figure> 
 					<a href="http://placekitten.com/" title="Visit Placekitten">
 						<img src="http://placekitten.com/570/300" alt="Large Image"/>
->>>>>>> gh-pages
 					</a>
 					<figcaption>An image which is linked</figcaption>
 				</figure>

print.css

@@ -114,12 +114,3 @@ v1.6.1 | Last Updated: 2010-09-17 | Author: Richard Clark (richclarkdesign.com)
 /*========
 [=4:Global layout styles]
 ======== */
-
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> gh-pages
-=======
->>>>>>> gh-pages

screen.css

@@ -105,25 +105,10 @@ v1.6.1 | Last Updated: 2010-09-17 | Author: Richard Clark (richclarkdesign.com)
 			form{margin:0 0 1em 0;}
 				legend{margin:0 0 0.25em 0;}
 				label{display:block;margin:0 0 0.25em 0;}
-<<<<<<< HEAD
-<<<<<<< HEAD
-				input[type="text"],textarea{display:block;width:auto;margin:0 0 0.78em 0;padding:0.5em 5px;border:1px solid #D1D1D1;font-size:1em;line-height:1.4em;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
-				legend{display:none;} 
 		/*Set styles for full forms (sets of inputs/labels should always be encased in an ordered list for example)*/  
-
-=======
-=======
->>>>>>> gh-pages
 				input,textarea{display:block;width:auto;margin:0 0 0.78em 0;padding:0.5em 5px;border:1px solid #D1D1D1;font-size:1em;line-height:1.4em;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
 				input[type="radio"],input[type="checkbox"]{width:auto;border:none;}
 				legend{display:none;} 
-		/*Set styles for full forms (sets of inputs/labels should always be encased in an ordered list for example)*/  
-
-
-<<<<<<< HEAD
->>>>>>> gh-pages
-=======
->>>>>>> gh-pages
 	/*--[=2e:Tables]--*/
 		table{margin:0 0 1em 0;width:100%;border:1px solid #ccc;}
 			caption{text-align:left;padding:0 0 0.5em 0;}