Fixed merge conflicts, up to date with branch (hopefully)

srctweb/website/templates/index.html

@@ -51,22 +51,23 @@ at Mason. See some of the ways we've improved life on campus on the <a href="{{
 available on our <a href="http://wiki.srct.gmu.edu">wiki</a>, and all of our
 code is visible on the <a href="http://git.gmu.edu/public">public page</a> of
 our student git repository.</p>
-<p>You can come to any of our planned <a href="{{ url_for('events') }}">events</a>. We hold
+<p>You can come to any of our planned <a href="//hackmason.org">events</a>. We hold
 numerous events each semester, from traveling to hackathons and conferences to
 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>
+<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
 get in touch are on our <a href="{{ url_for('contact') }}">contact page</a>.</p>
 
-  <legend><strong>Next Meeting</strong></legend>
-  <p>Our next meeting is scheduled for <em>TBA</em>. For more information, check
-  out our <a href="{{ url_for('calendar') }}">calendar</a>, or visit our
-  <a href="https://www.facebook.com/MasonSRCT">Facebook</a> or
-  <a href="https://www.twitter.com/MasonSRCT">Twitter</a> pages.</p>
-  
+<legend><strong>Next Meeting</strong></legend>
+<p>Our next meeting is scheduled for <em>TBA</em>. For more information, check
+out our <a href="{{ url_for('calendar') }}">calendar</a>, or visit our
+<a href="https://www.facebook.com/MasonSRCT">Facebook</a> or
+<a href="https://www.twitter.com/MasonSRCT">Twitter</a> pages.</p>
+
+</div>
 <!-- <script src="/static/js/parallax.min.js"></script>
 
 var scene = document.getElementById('jumboparallax');