Merge feature to the main

See merge request cse391/24wi/faang!101

Conflicts:
	Products.java
	Staff.java

Merge branch 'zliu44_staff_page' of gitlab.cs.washington.edu:cse391/24wi/faang into zliu44_staff_page

New bio to staff page and product to products page

See merge request cse391/24wi/faang!100

Manav's bio and product

See merge request cse391/24wi/faang!92

# Conflicts:
#   Products.java

samshar_staff_page merge request

See merge request cse391/24wi/faang!96

Added coffee

See merge request cse391/24wi/faang!95

Added ocean

See merge request !94

Added bio to staff page and product to products page

See merge request !93

# Conflicts:
#   Products.java
#   Staff.java

Spzappa staff page

See merge request !89

Yash's product and bio ready for commit

See merge request !88

Add profile and product

See merge request !87

staff info and product created

See merge request !86