link direct to page

[wiki.git] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index 622eb7a64e83c8301c6fec41958e8f1c89f9847a..c58c86884b9f70deaedb43939761a6e1a4865a52 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -9,11 +9,17 @@ 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]].
 
+## The Great Hacksby
+
+The Great Hacksby is happening this Sunday, starting at 1PM and going until arbitrarily late!  Find out [[more about projects we will be working on|/hackathons/great-hacksby/projects]].
+
 ## SIPB Projects and Services
 What does SIPB do for you?
 [[!template id=cols col1="""
 * [scripts.mit.edu](http://scripts.mit.edu/)<br/>
 Get your own blog or wiki, or run any web app!  The SIPB scripts server runs CGI scripts out of your Athena locker. ([Trac](http://scripts.mit.edu/trac/), [Wiki](http://scripts.mit.edu/wiki/Main_Page))
+* [xvm.mit.edu](http://xvm.mit.edu/)<br/>
+Your own virtual server.  Reliable, easy, and flexible. ([Launchpad](https://launchpad.net/invirt), [Launchpad](https://launchpad.net/xvm), [Trac](https://xvm.scripts.mit.edu/))
 * [debathena.mit.edu](http://debathena.mit.edu/)<br/>
 Bringing MIT's Athena environment to Debian and Ubuntu, first for our laptops, and then back to the clusters. ([Trac](http://debathena.mit.edu/trac/))
 * [[Your project here!|join]]