Merge branch 'main' into michelange-senat

brown-ccv · Jun 11, 2024 · 08afc79 · 08afc79
2 parents e459892 + a37ef2b
commit 08afc79
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/about/people.yml b/about/people.yml
@@ -465,6 +465,7 @@ data:
     brown_directory_uuid: 294d8182-b793-46ad-a6a8-6548b7378c2e
     bio: Sanjana is a data science intern working with the Computational Biology Core at CCV. She is concentrating in Computational Biology ('26) and is interested in genetics and public health. She also loves to read sci-fi, run, and spend time with friends!
     image: sanjana_main.jpg
+<<<<<<< michelange-senat
   - name: Michelange Senat
     type: Intern
     team: Advanced Research Computing
@@ -478,3 +479,14 @@ data:
 
 
 
+=======
+  - name: Jesus Rodriguez
+    type: Part Time
+    team: Advanced Research Computing
+    subteam: High-Performance Computing
+    title: Data Science Intern
+    github_username: monoguitari
+    brown_directory_uuid: 6be48c4b-0881-457b-b3f8-b0376b589fdb
+    bio: Jesus is a data science intern working with the High Performance Computing division at CCV. He is a rising junior at Brown University studying Computer Science. His academic interests include software development, machine learning, and mathematics. Outside of work, you can find him playing guitar, learning Vietnamese, or listening to music.
+    image: jesus_main.jpg
+>>>>>>> main
diff --git a/images/people/jesus_hover.jpg b/images/people/jesus_hover.jpg
diff --git a/images/people/jesus_main.jpg b/images/people/jesus_main.jpg