Merge branch 'master' into prod

Author: nicksloan

resources/speakers.html

@@ -29,6 +29,7 @@ <h2>Keynote</h2>
 		<ul class="speakers">
 			<li>
 				<h3>Rasmus Lerdorf</h3>
+                                <p>Rasmus Lerdorf is known for having gotten the PHP project off the ground in 1995 and has contributed to a number of other open source projects over the years. He was most recently an infrastructure architect at Yahoo! for more than 7 years before joining WePay in 2010. He was born in Greenland, grew up in Denmark and Canada and has a Systems Design engineering degree from the University of Waterloo. You can follow @rasmus on Twitter.</p>
 			</li>
 
 		</ul>
@@ -105,7 +106,10 @@ <h4>Phorum</h4>
 
 			<li>
 				<h3>Paul Reinheimer</h3>
-				<h4>XHProf and WonderProxy</h4>
+                                <p>Paul Reinheimer is a PHP developer living in Montréal, Quebec Canada. His business cards read: Photographer, Programmer, Baker. Most everyone is struck by one of the three terms.</p>
+                                <h4>XHProf and WonderProxy</h4>
+                                <p>I have two stories to tell and but one hour to fill, with luck I’ll weave them together as seamlessly as PHP’s parameter orders. The first is the story of WonderProxy a company I co-founded with a long time colleague to provide a way to test GeoIP applications. My goal with the story isn’t to sell you a product, far from it, but to talk about it’s underpinnings in PHP, and the success and failure we’ve experienced thus far. One of our failures was our incredibly slow website, luckily XHProf & XHGui helped us diagnose those issues (notice that excellent segue?). XHProf is a performance analysis tool released by facebook to aid developers by allowing them to profile production runs of their application. XHGui is a user interface for this information, allowing developers easy access to their information, providing graphs over time and other useful displays. This second story will dig through the reason behind the creation of this GUI, and a few useful hints on how to get the most out of it.</p>
+                                
 			</li>
 
 			<li>