Merge remote-tracking branch 'origin/master' into display

# Conflicts:
#	dungeonbattle/entities/player.py
#	dungeonbattle/game.py
#	dungeonbattle/interfaces.py
#	dungeonbattle/mapdisplay.py
#	dungeonbattle/settings.py
#	dungeonbattle/tests/settings_test.py
#	dungeonbattle/texturepack.py

dungeonbattle/entities/player.py

@@ -1,9 +1,22 @@
 from ..interfaces import FightingEntity
 
+
 class Player(FightingEntity):
     maxhealth = 20
     strength = 5
 
+    def move_up(self) -> bool:
+        return self.check_move(self.y - 1, self.x, True)
+
+    def move_down(self) -> bool:
+        return self.check_move(self.y + 1, self.x, True)
+
+    def move_left(self) -> bool:
+        return self.check_move(self.y, self.x - 1, True)
+
+    def move_right(self) -> bool:
+        return self.check_move(self.y, self.x + 1, True)
+
     currentXP: int
     maxXP: int