I edited the Staff file and Projects file and tried to merge to the main
Conflicts: Products.java Staff.java
Merge branch 'zliu44_staff_page' of gitlab.cs.washington.edu:cse391/24wi/faang into zliu44_staff_page
# Conflicts: # Staff.java
# Conflicts: # Products.java # Staff.java
