Merge branch 'master' of /afs/sipb.mit.edu/project/sipb-www/wiki

[wiki.git] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index a797b7e4d8cc519759394eeacc5cc149a92227a5..655524351c982cc2978c9637d86d0b73f142589d 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -32,8 +32,10 @@ Every year, SIPB offers a number of awesome computer-related events to the MIT c
 
 <img class="right" src="photos/hackathon-1.jpg" alt="hackathon" />
 
-* [[Computer Tours and Stories|stories]] <br />
-Meet us in the SIPB office Wednesday September 9th and 5:45 for tours of the machine rooms and stories with Jeff Schiller.
+* [[Ubuntu Global Jam|events/2009-ubuntu-global-jam]]<br />
+Saturday October 3rd. Learn more about Ubuntu and how to contribute.
+* [[The SIPB's 40th Reunion|reunion]]<br/>
+Saturday, October 10th SIPB is having its 40th reunion.
 * [IAP classes](http://sipb.mit.edu/iap)<br/>
 Teach or learn.  Knowledge is power.
 * [SIPB Cluedumps](http://cluedumps.mit.edu/) <br />