Merge remote-tracking branch 'origin/main' into working-on-routes-component

# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/app.module.ts
#	src/app/components/routes/route.ts
#	src/app/routes/routes.component.scss
#	src/styles.scss