Merge branch 'MapNew' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew

 Conflicts:

	src/game/Map.py

	src/game/TerrainTile.py

.gitignore

@@ -1 +1,2 @@
 /.idea/
+__pycache__

src/game/Game.py

@@ -42,7 +42,7 @@ class Game:
 
         # Start Map implement
         self.mapDataFolder = path.dirname("../data/mapdata/")
-        self.map = Map(path.join(self.mapDataFolder, 'map.txt'), self, self.screen)
+        self.map = Map(path.join(self.mapDataFolder, 'map.txt'), self.screen)
         # End Map implement
 
         self.mainLoop()