Merge branch 'develop' into release

Author: mmcinnestaylor

src/core/templates/core/index.html

@@ -255,7 +255,7 @@ <h4 class="card-title">Volunteering</h4>
             Please contact our team at <a href="mailto:contest@fsu.acm.org">contest@fsu.acm.org</a> for additional information! 
           </p>
           <small class="card-text">
-            A special thank you to ACM at FSU alumnus Will Davenport for donating the server hardware.
+            <em>A special thank you to ACM at FSU alumnus Will Davenport for donating the server hardware.</em>
           </small>
         </div>
       </div>

src/manager/forms.py

@@ -62,7 +62,7 @@ class Meta:
             'announcement_email_opt_out': 'Announcement Emails',
         }
         help_texts = {
-            'fsu_id': 'Excluding @my.fsu.edu ex: ab12c@my.fsu.edu -> ab12c',
+            'fsu_id': 'Excluding @fsu.edu ex: ab12c@fsu.edu -> ab12c',
             'fsu_num': 'Last 8 numbers on FSUCard. Exclude spaces.',
             'announcement_email_opt_out': 'Contest announcements delivered to your inbox.',
         }