Merge branch 'beta' into sucs-site

components/members.php

@@ -48,11 +48,11 @@ if ($session->loggedin) {
                 $homedir = explode('/', $usernames[0]['homedir']);
                 $usernames[0]['acctype'] = ucfirst($homedir[2]);
                 // Project
-                if (file_exists($usernames[0]['homedir'] . '/.project')) {
+                if (file_exists($usernames[0]['homedir'] . '/.project') && ! is_link($usernames[0]['homedir'] . '/.project')) {
                     $usernames[0]['project'] = file_get_contents($usernames[0]['homedir'] . '/.project');
                 }
                 // Plan
-                if (file_exists($usernames[0]['homedir'] . '/.plan')) {
+                if (file_exists($usernames[0]['homedir'] . '/.plan') && ! is_link($usernames[0]['homedir'] . '/.plan')) {
                     $usernames[0]['plan'] = file_get_contents($usernames[0]['homedir'] . '/.plan');
                 }
                 // Website

static/About/History.txt

@@ -29,7 +29,7 @@
 </td>
 <td><a href="/~elbows">elbows</a> (Laurence Sebastian Bowes)</td>
 <td><a href="/~unreturnable">unreturnable</a> (Isabel Jenkins)</td>
-<td><a href="/~coatlus">coatlus</a> (Megan Warren-Davis)</td>
+<td><a href="/~coatlus">coatlus</a> (Quetzal Mac Creamer Shorey)</td>
 <td><a href="/~andy">andy</a> (Andrew Vincent Pover)</td>
 <td><a href="/~gigosaurus">gigosaurus</a> (Christopher Lindsay Manners)</td>
 </tr>