body {
	font: 12px Georgia, Times, serif;
	padding: 0;
	margin: 0;
	color: #606060;
	background-image: url(/static/bg-repeat.gif);
}

a, a:visited {
	color: #10ADD6;
	text-decoration: none;
}

a:hover {
	color:#ff0000;
}

a img {
	border: 0;
}

#wrapper {
	width: 979px;
	margin:0 auto;
	border-left:1px solid #b3b3b3;
	border-right:1px solid #b3b3b3;
	border-bottom:1px solid #b3b3b3;
	background-color:#fff;
}
.clear {
	clear: both;
}

#content {
	width: 630px;
	float: left;
	padding-right: 10px;
	padding-left: 10px;
}

#sidebar {
	width: 300px;
	float: right;
	line-height: 24px;
	margin-right: 10px;
	padding-left: 15px;
	border-left: 1px solid #b3b3b3;
}

#sidebar p{
	margin: 8px 8px 8px 0;
	padding-top: 0px
}

#sidebar h2 {
	border-bottom: 2px solid #606060;
	color: #606060;
	margin-top:20px;
}

#sidebar h1 {
	font-size: 18px;
	margin-top: 12px;
}

.sidebartext {
	font-size: 16px;
}

ul{
	list-style-type: none;
	padding: 0;
}

.credit {
	font-size: 14px;
	margin-top: 0px;
	text-align: right;
}

ol {
	margin: 0;
	padding-left: 20px;
}

ol li {
	margin-bottom: 8px;
}

#sentences li{
	margin-top: 35px;
}

.voting {
	height: 50px;
	width: 120px;
	float: left;
<<<<<<< local
=======
	font-family: "trebuchet ms", arial, helvetica, sans-serif;
>>>>>>> other
}

.sentencetext {
	font-size: 18px;
	margin-left: 75px;
	width: 500px;
}

.votes {
	font-size: 32px;
	margin-left: 6px;
	margin-top: 0px;
	line-height: 32px;
}

.arrow {
	width: 36px;
	float: left;
	margin-top: 0px;
}

.spacer{
	width: 36px;
	float: left;
	visibility: hidden;
}

#story {
	font: Georgia, "Times New Roman", Times, serif;
	width: 600px;
	margin-left: 10px;
}

#storytext {
	font-size: 18px;
	line-height: 32px;
	padding: 12px 20px 12px 20px;
	border: 4px solid #a1c82b;
	margin-bottom: 25px;
}

#storytext a{
	color: #555;
}

#storytext a:hover {
	color:#1973e3;
}

#old_storytext {
	font-size: 18px;
	line-height: 32px;
	padding: 12px 20px 12px 20px;
	margin-bottom: 25px;
}

#old_storytext a{
	color: #555;
}

#old_storytext a:hover {
	color:#1973e3;
}

#old_storytext img {
	padding-right: 10px;
}

h1, h2, h3, h4 { 
<<<<<<< local
	color: #191919;
	font-family:lucida grande, trebuchet, arial, helvetica, sans-serif;
=======
	color: #404040;
	font-family: "trebuchet ms", arial, helvetica, sans-serif;
>>>>>>> other
}
<<<<<<< local
=======

h1 {
	font-size: 32px;
}
>>>>>>> other