onepointoh up to date with master

srctweb/website/templates/calendar.html

@@ -13,7 +13,11 @@ SRCT | Calendar
 </div>
 
 <div class="text-center">
-  <div class="visible-lg">
+  <div class="googlecal-container">
+  <iframe src="https://www.google.com/calendar/embed?title=Student-Run%20Computing%20and%20Technology&amp;showPrint=0&amp;showCalendars=0&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=kaiuicpoki9p3u92eklent0eec%40group.calendar.google.com&amp;color=%23711616&amp;ctz=America%2FNew_York" style=" border-width:0 " width="425" height="350" frameborder="0" scrolling="no"></iframe>
+
+  </div>
+<!--   <div class="visible-lg">
     <iframe src="https://www.google.com/calendar/embed?title=Student-Run%20Computing%20and%20Technology&amp;showPrint=0&amp;showCalendars=0&amp;height=700&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=kaiuicpoki9p3u92eklent0eec%40group.calendar.google.com&amp;color=%23711616&amp;ctz=America%2FNew_York" style=" border-width:0 " width="850" height="650" frameborder="0" scrolling="no"></iframe> 
   </div>
 
@@ -23,7 +27,7 @@ SRCT | Calendar
 
   <div class="visible-xs">
     <iframe src="https://www.google.com/calendar/embed?title=Student-Run%20Computing%20and%20Technology&amp;showPrint=0&amp;showCalendars=0&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=kaiuicpoki9p3u92eklent0eec%40group.calendar.google.com&amp;color=%23711616&amp;ctz=America%2FNew_York" style=" border-width:0 " width="600" height="400" frameborder="0" scrolling="no"></iframe>
-  </div>
+  </div> -->
 </div>
 
 {% endblock %}

srctweb/website/templates/contact.html

@@ -39,7 +39,7 @@ srct-devs@lists.srct.gmu.edu
 
 <p>We also have a
 <a href="https://facebook.com/MasonSRCT">public Facebook page</a>, a
-<a href="https://twitter/com/MasonSRCT">Twitter account</a>,
+<a href="https://twitter.com/MasonSRCT">Twitter account</a>,
 a <a href="https://reddit.com/MasonSRCT">subreddit</a>,
 and many of our members are regular contributors on
 <a href="https://reddit.com/r/gmu/">/r/gmu</a>.</p>