some updates

[wiki.git] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index 5ceadc070338531314cb3b32fd550ca8cd0289f6..ba0f0dd0e2c0c177439c36a09fa9fd2100695bd5 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -9,6 +9,8 @@ outside the Athena cluster in the student center W20, and you are
 welcome to come by to [[ask us for help|computer_help]] or to hang around, use our
 computers, and maybe [[get involved|join]]. You can find out what's abuzz in the SIPB community at [Planet SIPB](http://sipb.mit.edu/planet).  We host a number of events, which are enumerated on our [[calendar]].
 
+One of which [Admiral Hackbar](http://sipb.mit.edu/hackathons/admiral-hackbar/) is going on Right Now!.
+
 ## SIPB Projects and Services
 What does SIPB do for you?
 [[!template id=cols col1="""
@@ -30,20 +32,16 @@ Have a computing question or need some help? Come drop by our office.
 """]]
 
 ## SIPB Events
-Every year, SIPB offers a number of awesome computer-related events to the MIT community. Here's a list of some of our events:
+Every year, SIPB offers a number of awesome computer-related events to the MIT community. You can view upcoming ones at <a href="http://sipb.mit.edu/calendar/">our google calendar</a>. Here's a list of some of our past or recurring events:
 
 <img class="right" src="photos/hackathon-1.jpg" alt="hackathon" />
 
-* [[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 />
-Every year, SIPB hosts a number of computer-related technical talks on a variety of subjects.
 * [[Hackathons|hackathons]] <br />
 Like coding? Come work on cool projects with us at SIPB! We're always looking for new members, so feel free to drop by our Hackathons to help us improve computing at MIT.
+* [SIPB Cluedumps](http://cluedumps.mit.edu/) <br />
+Every year, SIPB hosts a number of computer-related technical talks on a variety of subjects.
+* [IAP classes](http://sipb.mit.edu/iap)<br/>
+Teach or learn.  Knowledge is power.
 * [[SIPB Computer Tours|computer_tours]] <br />
 At the beginning of each year, SIPB offers tours of the MIT computing infrastructure, including Athena server rooms, interesting labs.
 * [[SIPB Computer Stories|computer_stories]]<br />