From b442338b720c3a4f3935c0a853617d598638f3c3 Mon Sep 17 00:00:00 2001
From: Patrick Melanson <pj2melan@uwaterloo.ca>
Date: Mon, 9 May 2016 15:38:24 -0400
Subject: [PATCH] added steven bourque/mpatters infrastructure talk, and sams
 16 talks

---
 media/index.xml | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/media/index.xml b/media/index.xml
index 7da299d..dfc07f6 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -11,6 +11,45 @@
     CD or DVD should you so choose.
     <ul class="media">
 
+<mediaitem title="SAMS - Seminars and More Seminars">
+  <abstract>
+    <p>
+      Four talks on a range of CS-related topics.
+      <br />
+      Theo Belaire will talk about his experience developing modules for the Linux kernel
+      in the Rust programming language, and its pitfalls.
+      <br />
+      Bryan Coutts will talk about the weighted closest neighbour problem, which has
+      important applications in finding not only the nearest pizza place, but the fastest
+      pizza place.
+      <br />
+      Richard Ye will talk about a few important design principles to keep in mind
+      when making web UIs, or any UIs in general.
+      <br />
+      Tristan Hume will talk about his experience using binary forms of data communication,
+      and a sample protocol for binary communication.
+    </p>
+  </abstract>
+  <presentor>Theo Belaire, Ford Peprah, Tristan Hume, Richard Ye, Bryan Coutts</presentor>
+  <mediafile file="b2coutts-sams16-talk.mp4"/>
+  <mediafile file="richardye-sams16-talk.mp4"/>
+  <mediafile file="tbelaire-sams16-talk.mp4"/>
+  <mediafile file="tghume-sams16-talk.mp4"/>
+  <thumbnail file="richardye-sams16-talk-thumb-small.jpg"/>
+</mediaitem>
+
+<mediaitem title="Network Infrastructure talk">
+  <abstract>
+    <p>
+      Steve Bourque and Mike Patterson of IST will give a brief overview of campus network connectivity and interconnectivity. Steve will describe the general connections, and Mike will talk about specific security measures in place. We'll have refreshments!
+    </p>
+  </abstract>
+  <presentor>Steve Bourque and Mike Patterson</presentor>
+  <mediafile file="uw-infrastructure-sbourque-half.mp4"/>
+  <mediafile file="uw-infrastructure-mpatters-half.mp4"/>
+  <thumbnail file="uw-infrastructure-sbourque-half-thumb-small.jpg"/>
+</mediaitem>
+
 <mediaitem title="CSC and WiCS Career Panel">
   <abstract>
     <p>