Merge branch 'master' into trinif-patch-1

src/json/members/ashzhang.json

@@ -0,0 +1,18 @@
+{
+  "name": "Ashley Zhang",
+  "pennkey": "ashzhang",
+  "major": "Computer Science, Finance",
+  "school": "Engineering, Wharton",
+  "bio": "Sophomore in M&T studying computer science and finance who enjoys grabbing food with friends, violin/music, and traveling!",
+  "hometown": "Paoli, PA",
+  "team": "Penn Mobile",
+  "roles": ["Backend Engineer"],
+  "photo": "https://i.imgur.com/eYv9bAg.jpg",
+  "linkedin": "https://www.linkedin.com/in/ashley-zhang-b66701209/",
+  "website": "",
+  "github": "",
+  "semester_joined": "2023C",
+  "alumnus": false,
+  "graduation_year": 2026,
+  "job": null
+}