Merge branch 'master' of git.gmu.edu:srct/srctweb

srctweb/website/templates/index.html

@@ -57,8 +57,7 @@ doing local outreach, holding large programming events, and hosting speakers.</p
 <p>We're on <a href="https://www.facebook.com/MasonSRCT">Facebook</a> and
 <a href="https://www.twitter.com/MasonSRCT">Twitter</a>, have
 <a href="http://lists.srct.gmu.edu/mailman/listinfo">active mailing lists</a>,
-and an <a href="https://en.wikipedia.org/wiki/Internet_Relay_Chat">IRC</a>
-channel on <a href="https://www.freenode.net/">freenode</a>, #srct. More ways to
+and an active <a href="https://srct.slack.com/">Slack team</a>. More ways to
 get in touch are on our <a href="{{ url_for('contact') }}">contact page</a>.</p>
 
 <legend><i class="fa fa-gavel fa-fw"></i>&nbsp;<strong>Next Meeting</strong></legend>

srctweb/website/templates/people.html

@@ -24,45 +24,46 @@ The people who make up this community of developers!
   </thead>
   <tbody>
     <tr>
-      <td><img class="img-circle img-responsive center center-block" src="{{ 'mgauto@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
-      <td><h5>Manuel Gauto</h5></td>
+      <td><img class="img-circle img-responsive center center-block" src="{{ 'akarthik@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
+      <td><h5>Akshay Karthik</h5></td>
       <td>
         <a href="http://wiki.srct.gmu.edu/President"><h5>President</h5></a>
       </td>
-      <td><h5><em>mgauto</em></h5></td>
+      <td><h5><em>akarthik</em></h5></td>
     </tr>
     <tr>
-      <td><img class="img-circle img-responsive center center-block" src="{{ 'ksarkhel@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
-      <td><h5>Kunal Sarkhel</h5></td>
+      <td><img class="img-circle img-responsive center center-block" src="{{ 'nander13@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
+      <td><h5>Nicholas Anderson</h5></td>
       <td>
         <a href="http://wiki.srct.gmu.edu/Systems_Administrator"><h5>Systems Admininstrator</h5></a>
       </td>
-      <td><h5><em>ksarkhel</em></h5></td>
+      <td><h5><em>nander13</em></h5></td>
     </tr>
     <tr>
-      <td><img class="img-circle img-responsive center center-block" src="{{ 'akarthik@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
-      <td><h5>Akshay Karthik</h5></td>
+      <td><img class="img-circle img-responsive center center-block" src="{{ 'ksarkhel@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
+      <td><h5>Kunal Sarkhel</h5></td>
       <td>
         <a href="http://wiki.srct.gmu.edu/Vice_President"><h5>Vice President</h5></a>
       </td>
-      <td><h5><em>akarthik</em></h5></td>
+      <td><h5><em>ksarkhel</em></h5></td>
     </tr>
     <tr>
-      <td><img class="img-circle img-responsive center center-block" src="{{ 'jyeoman2@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
-      <td><h5>Jason Yeomans</h5></td>
+      <td><img class="img-circle img-responsive center center-block" src="{{ 'dhaynes3@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
+      <td><h5>David Haynes</h5></td>
       <td>
         <a href="http://wiki.srct.gmu.edu/Treasurer"><h5>Treasurer</h5></a>
       </td>
-      <td><h5><em>jyeomans2</em></h5></td>
+      <td><h5><em>dhaynes3</em></h5></td>
     </tr>
     <tr>
-      <td><img class="img-circle img-responsive center center-block" src="{{ 'nlapier2@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
-      <td><h5>Nathan Lapierre</h5></td>
+      <td><img class="img-circle img-responsive center center-block" src="{{ 'ssarhan2@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
+      <td><h5>Sherif Sarhan</h5></td>
       <td>
         <a href="http://wiki.srct.gmu.edu/Secretary"><h5>Secretary</h5></a>
       </td>
-      <td><h5><em>nlapier2</em></h5></td>
+      <td><h5><em>ssarhan2</em></h5></td>
     </tr>
+    <!--
     <tr>
       <td><img class="img-circle img-responsive center center-block" src="{{ 'asonntag@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
       <td><h5>Audrey Sonntag</h5></td>
@@ -72,6 +73,7 @@ The people who make up this community of developers!
       <td><h5><em>asonntag</em></h5></td>
     </tr>
     <tr>
+    -->
     <tr>
       <td><img class="img-circle img-responsive center center-block" src="{{ 'kdobolyi@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
       <td><h5>Kinga Dobolyi</h5></td>
@@ -147,6 +149,18 @@ The people who make up this community of developers!
       <td>Jason Yeomans</td>
       <td><em>jyeoman2</em></td>
     </tr>
+    <tr>
+      <td>David Stein</td>
+      <td><em>dstein3</em></td>
+    </tr>
+    <tr>
+      <td>Lilas Dinh</td>
+      <td><em>vdinh3</em></td>
+    </tr>
+    <tr>
+      <td>Michael Bailey</td>
+      <td><em>mbaile18</em></td>
+    </tr>
   </tbody>
 </table>
 </div>
@@ -208,6 +222,22 @@ The people who make up this community of developers!
       <td>Nathan LaPierre</td>
       <td><em>nlapier2</em></td>
     </tr>
+    <tr>
+      <td>Sherif Sarhan</td>
+      <td><em>ssarhan2</em></td>
+    </tr>
+    <tr>
+      <td>David Haynes</td>
+      <td><em>dhaynes3</em></td>
+    </tr>
+    <tr>
+      <td>Briana Abraham</td>
+      <td><em>babraha2</em></td>
+    </tr>
+    <tr>
+      <td>Ananya Dhawan</td>
+      <td><em>adhawan2</em></td>
+    </tr>
   <tbody>
 </table>
 </div>