# Conflicts:
#   Products.java

Sirjan1 staff page

See merge request !171

# Conflicts:
#   Staff.java

Rlyons8 staff page

See merge request !187

Merge main into branch.

Merge main into branch
.

Lowered resolution of mat's cat

See merge request !185

Matfan's amazing staff page

See merge request !180

Qsun05 staff page

See merge request !177

Added staff profile and product

See merge request !172

Add Employee and Product Object

See merge request !169

# Conflicts:
#   Products.java
#   Staff.java

commit for wgong2

See merge request !163

resolving merge conflict

rlyons8 staff bio and product

See merge request !154

# Conflicts:
#   Staff.java