# Conflicts:
#   Products.java
#   Staff.java

Ctsai7 staff page

See merge request !102

Tly6 staff page

See merge request !90

Merge feature to the main

See merge request !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 !100

# Conflicts:
#   Staff.java

Manav's bio and product

See merge request !92

# Conflicts:
#   Products.java

samshar_staff_page merge request

See merge request !96

Added coffee

See merge request !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