Merge Blaine's changes, resolve conflict

hyperdriveguy · hyperdriveguy · commit 3aa6bb566dce · 2024-05-13T16:16:06.000-06:00
diff --git a/_data/students.yaml b/_data/students.yaml
@@ -92,3 +92,7 @@ undergrad_students:
   - first_name: Blaine
     last_name: Freestone
     image: blaine_freestone.jpg
+
+  - first_name: Carson
+    last_name: Bush
+    image: carson_bush.jpg
