Merge branch 'master' into 'beta'

Getting the name of our secretary helps!

See merge request !54

static/About/History.txt

@@ -18,7 +18,7 @@
 </td>
 <td><strong><a href="/~andy">andy</a> (Andrew Vincent Pover)</strong></td>
 <td><strong><a href="/~eggnog">eggnog</a> (George Henry Woolley)</strong></td>
-<td><strong><a href="/~sgelfod98">sgelfod98</a> (Quetzal Miguel Creamer Shorey)</strong></td>
+<td><strong><a href="/~sgelfod98">sgelfod98</a> (Megan Warren-Davis)</strong></td>
 <td><strong><em>N/A</em></strong></td>
 <td><strong><a href="/~crox">crox</a> (Ciaran Crocker)</strong></td>
 </tr>