Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/ch/zhaw/catan/Structure.java

src/ch/zhaw/catan/Structure.java

@@ -7,7 +7,7 @@ public abstract class Structure {
         this.faction = faction;
     }
 
-    public Config.Faction getFaction() {
+    public String toString() {
-        return faction;
+        return faction.toString();
     }
 }