another photo

[wiki.git] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index ed2c261886301f821dd6a275d7c29ee89c1e67d1..6b12dbe1230680d21cd88265d12e26244df30e06 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -11,22 +11,40 @@ What does SIPB do for you?
 Get your own blog or wiki, or run any web app!  The SIPB scripts server runs CGI scripts out of your Athena locker.
 * [xvm.mit.edu](http://xvm.mit.edu/)<br/>
 Your own virtual server.  Reliable, easy, and flexible.
 Get your own blog or wiki, or run any web app!  The SIPB scripts server runs CGI scripts out of your Athena locker.
 * [xvm.mit.edu](http://xvm.mit.edu/)<br/>
 Your own virtual server.  Reliable, easy, and flexible.

-* [IAP classes](http://sipb.mit.edu/iap)<br/>
-Teach or learn.  Knowledge is power.
-""" col2="""

 * [debathena.mit.edu](http://debathena.mit.edu/)<br/>
 The power of MIT's Athena environment on your own computer.
 * [debathena.mit.edu](http://debathena.mit.edu/)<br/>
 The power of MIT's Athena environment on your own computer.

+* [Your project here!](join)
+""" col2="""

 * [linerva.mit.edu](http://linux.mit.edu/)<br/>
 Dialup access to Debathena.
 * [Documentation](documentation) <br />
 Helpful and informative documents about various computing topics at MIT, written by SIPB.
 * [linerva.mit.edu](http://linux.mit.edu/)<br/>
 Dialup access to Debathena.
 * [Documentation](documentation) <br />
 Helpful and informative documents about various computing topics at MIT, written by SIPB.

-* Many, many more!
+* [Computer Help](computer_help) <br />
+Have a computing question or need some help? Come drop by our office.
+* [and many more](projects)

 """]]
 
 """]]
 

+## 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:
+
+* [IAP classes](http://sipb.mit.edu/iap)<br/>
+Teach or learn.  Knowledge is power. <br />
+* [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 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 />
+Come listen to interesting computer stories about MIT in this annual event.
+
+

 ## Getting Involved
 
 SIPB is always open to new contributors.  You can join one of the projects above or start your own.  Learn more about [[getting_involved|join]].
 
 ## Getting Involved
 
 SIPB is always open to new contributors.  You can join one of the projects above or start your own.  Learn more about [[getting_involved|join]].
 

+![hackathon](photos/hackathon-1.jpg)
+

 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info).
 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info).