Merge branch 'main' into zliu44_staff_page

Conflicts: Products.java Staff.java

Merge branch 'main' into zliu44_staff_page
adbabfe8 · Leo Liu · b16f087b · c167a7e8 · adbabfe8 · adbabfe8
Commit adbabfe8 authored 1 year ago by Leo Liu
--- a/images/staff/LebronJamesMeme.jpg
+++ b/images/staff/LebronJamesMeme.jpg
--- a/images/staff/LongLiveASAP.jpeg
+++ b/images/staff/LongLiveASAP.jpeg
--- a/images/staff/broom.PNG
+++ b/images/staff/broom.PNG
--- a/images/staff/dog.jpg
+++ b/images/staff/dog.jpg
--- a/images/staff/energy.jpg
+++ b/images/staff/energy.jpg
--- a/images/staff/flower.jpg
+++ b/images/staff/flower.jpg
--- a/images/staff/ketchup.jpg
+++ b/images/staff/ketchup.jpg
--- a/images/staff/kevyin30.jpg
+++ b/images/staff/kevyin30.jpg
--- a/images/staff/keyboard_protecc.png
+++ b/images/staff/keyboard_protecc.png
--- a/images/staff/kirby_sword.png
+++ b/images/staff/kirby_sword.png
--- a/images/staff/lebron_james.jpeg
+++ b/images/staff/lebron_james.jpeg
--- a/images/staff/monkey.jpg
+++ b/images/staff/monkey.jpg
--- a/images/staff/ocean.jpg
+++ b/images/staff/ocean.jpg
--- a/images/staff/picture.jpg
+++ b/images/staff/picture.jpg
--- a/images/staff/ski.png
+++ b/images/staff/ski.png
--- a/images/staff/sleepy_dog.jpg
+++ b/images/staff/sleepy_dog.jpg
--- a/images/staff/stickman.png
+++ b/images/staff/stickman.png
--- a/images/staff/this_is_fine.png
+++ b/images/staff/this_is_fine.png