Merged master

dungeonbattle/interfaces.py

@@ -2,7 +2,6 @@
 from enum import Enum
 
 
-
 class Map:
     """
     Object that represents a Map with its width, height
@@ -12,7 +11,7 @@ class Map:
     height: int
     tiles: list
 
-    def __init__(self, width: int, height: int, tiles: list, entities: list):
+    def __init__(self, width: int, height: int, tiles: list, entities = []: list):
         self.width = width
         self.height = height
         self.tiles = tiles
@@ -38,7 +37,11 @@ class Map:
         width = len(lines[0])
         tiles = [[Tile(c)
                   for x, c in enumerate(line)] for y, line in enumerate(lines)]
+<<<<<<< HEAD
         return Map(width, height, tiles)
+=======
+        return Map(width, height, tiles, [])
+>>>>>>> master
 
     def draw_string(self) -> str:
         """