Merge branch 'master' of caffeine.uwaterloo.ca:/users/www/www

events.xml

@@ -5,6 +5,21 @@
 
 <!-- Winter 2009 -->
 
+<eventitem date="2009-03-05" time="4:30 PM" edate="2009-03-05" etime="6:30 PM" room="Comfy Lounge" title="SIGGRAPH Night">
+  
+    <short><p>Come out and watch the SIGGRAPH (Special Interest Group on Graphics) conference video review.  A video of insane, amazing, and mind blowing computer graphics. . 
+</p></short>
+  
+  
+    <abstract><p>The ACM SIGGRAPH (Special Interest Group on Graphics) hosts a conference yearly in which the 
+latest and greatest in computer graphics premier. They record video and as a result produce a 
+very nice Video Review of the conference. Come join us watching these videos, as well as a 
+few professors from the UW Computer Graphics Lab. There will be some kind of food and drink, 
+and its guranteed to be dazzling. 
+</p></abstract>
+  
+</eventitem>
+
 <eventitem date="2009-03-12" time="8:00 AM" edate="2009-03-13" etime="9:00 PM"
 	   room="Toronto Hilton" title="Canadian Undergraduate Technology Conference">
   <short>

stats.html

@@ -34,15 +34,9 @@
   <tr>
     <td colspan="2" class="stats2">CSClub:
       <a href="http://cacti.csclub.uwaterloo.ca/graph_view.php">More Graphs</a> |
-      <a href="http://bittorrent.csclub.uwaterloo.ca/">BitTorrent Tracker</a>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" class="stats2">ORION:
-      <a href="http://tech.orion.on.ca/orionmap/south.html">"South" Network Map</a> |
-      <a href="http://tech.orion.on.ca/orionmap/north.html">"North" Network Map</a> |
-      <a href="http://tech.orion.on.ca/orionmap/tera.html">"Toronto" Network Map</a> |
-      <a href="http://tech.orion.on.ca/mrtg/DIST1-WTLO.html">Waterloo Graphs</a> |
+      <a href="http://bittorrent.csclub.uwaterloo.ca/">BitTorrent Tracker</a> |
+      ORION:
+      <a href="http://www.orion.on.ca/trafficmap.html">Network Map</a> |
       <a href="http://tech.orion.on.ca/cgi/lg.cgi">Looking Glass</a>
     </td>
   </tr>