Merge branch 'main' of https://git.cardiff.ac.uk/c24020257/sports-league-application into 69-as-a-user-i-want-a-rules-page-with-a-search-bar-and-three-links-each-link-to-the-rules-of-darts

# Conflicts:
#	src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java