added link to conference

diff --git a/join.php b/join.php
index a3a1e5446735de4daf34a48d976c5da1f3e111f8..50ad2a10af80d5c2b9c1dc1234b6b7e73585f067 100644 (file)
--- a/join.php
+++ b/join.php
@@ -1,12 +1,20 @@
-
+<!-- 
        <h1>LibrePlanet helps users, developers and activists connect and share information and resources.</h1>
 
          <div id="signup-form">
 
          <p><a href="?p=s">Sign up now</a><!--  or <a href="/tour">take a guided tour!</a>--> &mdash; it takes 30 seconds!</p>
 
-         </div>
-        
+         </div> -->
+
+
+         <h1>LibrePlanet 2010 conference &mdash; March 19th, 20th and 21st 2010. Harvard Science Center.</h1>
+
+         <ul>
+          <li><a href="http://groups.fsf.org/wiki/LibrePlanet2010/Schedule">Conference schedule</a></li>
+    <li><a href="http://groups.fsf.org/wiki/LibrePlanet2010/Attendees">Registration</a> ($60 or free for <a href="http://www.fsf.org/join">FSF members</a>)</li>
+        </ul>
+
         <div id="big-globe">
  
 <p><img src="big-globe.png" /></p>