From b3ead8b5418f3e11f6b93a79930465e30fae826f Mon Sep 17 00:00:00 2001
From: Marc Burns <m4burns@uwaterloo.ca>
Date: Mon, 30 Jul 2012 17:58:08 -0400
Subject: [PATCH] Set up for Fall elections.

---
 events.xml | 22 ++++++++++++++++++++++
 news.xml   |  6 +++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/events.xml b/events.xml
index f189384..ebf0099 100644
--- a/events.xml
+++ b/events.xml
@@ -13,6 +13,28 @@
 	</abstract>
 </eventitem>
 
+<!-- Uncomment this when nominations begin.
+<eventitem date="2012-09-13" time="4:00 PM" room="Comfy Lounge" title="Elections">
+    <short>
+    <p>CSC Elections have begun for the Fall 2012 term, nominations are open!</p>
+    </short>
+    <abstract>
+<p>It's elections time again! On Thursday September 13th at 4:00PM, come to the Comfy Lounge
+on the 3rd floor of the MC to vote in this term's President, Vice-President, Treasurer
+and Secretary. The sysadmin, librarian, and office manager will also be chosen at this time.</p>
+
+<p>Nominations are open until 4:00PM on Wednesday September 12th, and can be
+written on the CSC office whiteboard (yes, you can nominate yourself). All CSC members 
+can vote and are invited to drop by. You may also send nominations to the
+<a href="mailto:cro@csclub.uwaterloo.ca">
+   Chief Returning Officer</a>. A full list of candidates will be posted
+   when nominations close.</p>
+
+    <p>Good luck to our candidates!</p>
+    </abstract>
+</eventitem>
+-->
+
 <eventitem date="2012-09-06" time="17:00" room="Math 3 Atrium" title="SCS First-year Welcome Dinner">
 	<short>
 		<p>The School of Computer Science is hosting a dinner event for incoming first-year students. You'll get to meet us, some of the faculty, and other new undergraduates. Food will be provided.</p>
diff --git a/news.xml b/news.xml
index 221d1f5..d2d7e60 100644
--- a/news.xml
+++ b/news.xml
@@ -2,7 +2,11 @@
 
 <!DOCTYPE newdefs SYSTEM "csc.dtd">
 <newsdefs>
-
+<newsitem author="m4burns" date="2012-07-30">
+    <p>
+    Elections for Fall 2012 will be held on September 13 at 4:00 PM. Nominations will begin on September 6th, and will end 24 hours prior to elections. Nominations may be emailed to <a href="mailto:cro@csclub.uwaterloo.ca">cro@csclub.uwaterloo.ca</a>. This term's CRO is Owen Smith (omsmith).
+    </p>
+</newsitem>
 <newsitem author="m4burns" date="2012-06-06">
     <p>
     To all of our members who are interested in attending CUMC at UBCO this summer, please remember to <a href="https://docs.google.com/spreadsheet/viewform?formkey=dG56d3NRNUJabzQyMmpNTDlqWkpiU3c6MQ">apply for funding!</a>