correcting conflict

Merge branch 'master' of github.com:scoates/phpcon-web

Conflicts:
	resources/sponsorships.html

Author: lisamusing

css/style.css

@@ -359,3 +359,22 @@ div.communitySponsor > a {
 div#sponsors > div > a {
     margin-right: 20px;
 }
+
+div#container.sub.speakers ul.speakers {
+	list-style-type: none;
+	margin-left: 0;
+	padding-left: 0;
+}
+
+div#container.sub.speakers ul.speakers h3 {
+	font-family: "MuseoSlab500";
+	font-weight: bold;
+}
+
+div#container.sub.speakers ul.speakers h4 {
+	font-family: "MuseoSlab500";
+	color: #363636;
+	font-size: 16px;
+}
+
+

resources/404.html

@@ -10,7 +10,7 @@ <h1>PHP Community
                 <div id="nav">
                     <ul>
                         <li><a href="home">Home</a></li>
-                        <li><a href="http://phpcon.eventbrite.com/">Register</a></li>
+                        <li><a href="speakers">Speakers</a></li>
                         <li><a href="about">About Us</a></li>
                         <li><a href="sponsorships">Sponsor Us</a></li>
                         <li><a href="subscribe">Keep in Touch</a></li>

resources/about.html

@@ -10,10 +10,9 @@ <h1>PHP Community
                 <div id="nav">
                     <ul>
                         <li><a href="home">Home</a></li>
-                        <li><a href="register">Register</a></li>
+			<li><a href="speakers">Speakers</a></li>
                         <li>About Us</li>
                         <li><a href="sponsorships">Sponsor Us</a></li>
-                        <li><a href="subscribe">Keep in Touch</a></li>
                     </ul>
                 </div>
                 <div id="social">

resources/cfp.html

@@ -15,10 +15,9 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
                 <div id="nav">
                     <ul>
                         <li>Home</li>
-                        <li><a href="register">Register</a></li>
+                        <li><a href="speakers">Speakers</a></li>
                         <li><a href="about">About Us</a></li>
                         <li><a href="sponsorships">Sponsor Us</a></li>
-                        <li><a href="subscribe">Keep in Touch</a></li>
                     </ul>
                 </div>
             </div>