From 346e4f32573ed9a4c5cb19fcb467400a98e373df Mon Sep 17 00:00:00 2001
From: John 'Warthog9' Hawley <warthog9@eaglescrag.net>
Date: Tue, 17 Jan 2017 23:57:09 -0800
Subject: [PATCH 1/3] Fixing typo in Terri's name (adding space)

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index b1a8c51..3485e76 100644
--- a/index.html
+++ b/index.html
@@ -40,7 +40,7 @@ <h1>Google Summer of Code 2017 @ the Python Software Foundation</h1>
 projects related to the development of the Python language.  It is our
 intention to apply again for the 2017 season!
 
-<p>The 2017 Python Software Foundation (PSF) GSoC coordinator is TerriOda. (terri on Freenode IRC, terrioda
+<p>The 2017 Python Software Foundation (PSF) GSoC coordinator is Terri Oda. (terri on Freenode IRC, terrioda
 at gmail.com, but please email gsoc-admins(at)python(dot)org if you wish to
 contact an admin. Students should almost always email
 gsoc-general(at)python(dot)org.)

From 0fe739cf7db2d6a2fbe95bc8084df289a03f5131 Mon Sep 17 00:00:00 2001
From: John 'Warthog9' Hawley <warthog9@eaglescrag.net>
Date: Tue, 17 Jan 2017 23:57:42 -0800
Subject: [PATCH 2/3] Breaking up the admin's names and adding John 'Warthog9'
 Hawley to the list

---
 index.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 3485e76..8d6e0d3 100644
--- a/index.html
+++ b/index.html
@@ -45,9 +45,15 @@ <h1>Google Summer of Code 2017 @ the Python Software Foundation</h1>
 contact an admin. Students should almost always email
 gsoc-general(at)python(dot)org.)
 
-<p>The other org admins include James Lopeman (meflin on IRC), Florian Fuchs
-(florianf on IRC), Kushal Das (kushal on IRC) and Stephen Turnbull
-(yaseppochi on IRC)
+<p>The other org admins include:
+<ul>
+	<li>James Lopeman (meflin on IRC)</li>
+	<li>Florian Fuchs (florianf on IRC)</li>
+	<li>Kushal Das (kushal on IRC)</li>
+	<li>Stephen Turnbull (yaseppochi on IRC)</li>
+	<li>John Hawley (warthog9 on IRC)</li>
+</ul>
+</p>
 
 <h2>Getting in Touch</h2>
 

From be64b7177ccc55abd624aa98520adf73ce2306e3 Mon Sep 17 00:00:00 2001
From: John 'Warthog9' Hawley <warthog9@eaglescrag.net>
Date: Tue, 17 Jan 2017 23:58:33 -0800
Subject: [PATCH 3/3] Adding Zulip information

---
 index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/index.html b/index.html
index 8d6e0d3..8179dc5 100644
--- a/index.html
+++ b/index.html
@@ -69,6 +69,8 @@ <h2>Getting in Touch</h2>
 <li>Stop by #python-gsoc on irc.freenode.net to chat and ask questions in
 realtime.  </li>
 
+<li>If you are uncomfortable with IRC, you may try our Zulip instance at <a href="https://zulip.python-gsoc.org">https://zulip.python-gsoc.org</a>.  We are working on IRC integration, but for now they are two separate instances so please be aware of that.</li>
+
 <li>Found a typo?  Want to improve this page? <a
 href="https://github.com/python-gsoc/python-gsoc.github.io">The source code
 is on GitHub and we welcome pull requests!</a></li>