Merge branch 'main' into epic/fridge-controller

Sync to changes in main branch

src/main/java/ntnu/idatt2016/v233/SmartMat/config/CorsConfig.java

@@ -35,7 +35,7 @@ public class CorsConfig {
             public void addCorsMappings(CorsRegistry registry) {
                 registry.addMapping("/**")
                         .allowedOrigins(Arrays.asList("https://localhost",
-                                "https://10.24.38.136",
+                                "https://10.24.21.135",
                                 domainProperty.domain()
                         ).toArray(String[]::new))
                         .allowedMethods(Arrays.asList(