Merge branch 'main' into eliminate_rosters

# Conflicts:
#	majors.py

majors.py

@@ -40,8 +40,8 @@ class Major:
 
 
 Major('Computer Science', alternate_names={'Computer Science (Raikes)'},
-      abbreviations={'COMP-BS', 'COMP-BA', 'COMP-MAJ', 'COMP-BSCS',  # we don't yet have BSCS
-                     'JECS-BS', 'JECS-BA', 'JECS-MAJ', 'JECS-BSCS'})  # but I expect we soon will
+      abbreviations={'COMP-BS', 'COMP-BA', 'COMP-MAJ', 'CMPS-BSCS',
+                     'JECS-BS', 'JECS-BA', 'JECS-MAJ', 'JECS-BSCS'})  # double-check Raikes BSCS
 Major('Computer Engineering', alternate_names={'Computer Engineering (Raikes)'},
       abbreviations={'CENG-BSCP', 'JECE-BSCP'})
 Major('Software Engineering', alternate_names={'Software Engineering (Raikes)'},