Merge pull request #3 from travisbrown/topic/sbtb

Fix CFP link and add favicon, note about Scala by the Bay

cfp.html

@@ -10,6 +10,7 @@
     <meta name="author" content="">
 
     <title>#FinagleCon 2015</title>
+    <link rel="icon" type="image/png" href="/favicon.png">
 
     <!-- Bootstrap Core CSS - Uses Bootswatch Flatly Theme: http://bootswatch.com/flatly/ -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -86,7 +87,7 @@ <h2>Call for Papers</h2>
 						<p>The CFP deadline is <b>Tuesday, June 30th, 2015 at midnight (PST)</b>.</p>
 	                    <p>#FinagleCon is an annual conference organized by the Finagle community, bringing together users and developers to share and learn about the project and its growing ecosystem. The conference will feature one day of talks and tutorials by adopters and contributors about Finagle, Finatra, Finch, and related technologies. To help encourage the open collaboration and discussions that are necessary to help the greater Finagle ecosystem be successful, we invite Finagle adopters and contributors to submit a proposal for the event.
 						</p>
-						<a href="https://www.regonline.com/Register/Checkin.aspx?EventID=1719477" class="btn btn-lg btn-outline">
+						<a href="http://events.linuxfoundation.org/cfp/dashboard" class="btn btn-lg btn-outline">
 	                        <i class="fa fa-user"> Submit Proposal</i>
 	                    </a>
 	                </div>

index.html

@@ -10,6 +10,7 @@
     <meta name="author" content="">
 
     <title>#FinagleCon 2015</title>
+    <link rel="icon" type="image/png" href="/favicon.png">
 
     <!-- Bootstrap Core CSS - Uses Bootswatch Flatly Theme: http://bootswatch.com/flatly/ -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -85,7 +86,8 @@
                         <span class="name">#FinagleCon 2015</span>
                         <span class="skills">August 13th, 2015</span>
                         <hr class="star-light">
-                        <span class="skills">The first annual Finagle community conference</span>
+                        <div><span class="skills">The first annual Finagle community conference</span></div>
+                        <div><span class="skills">Co-located with <a href="http://scala.bythebay.io/">Scala by the Bay 2015</a></span></div>
                         <br />
 						<a href="https://www.regonline.com/Register/Checkin.aspx?EventID=1719477" class="btn btn-lg btn-outline">
 	                        <i class="fa fa-user"> Register</i>