Merge branch 'master' of https://github.com/inf112-v20/Fiasko

src/main/java/inf112/fiasko/roborally/objects/Board.java

@@ -328,6 +328,7 @@ public class Board {
             if (robot.getAmountOfLives() > 0) {
                 robot.setPosition(robot.getBackupPosition());
                 robot.setFacingDirection(Direction.NORTH);
+                robot.setDamageTaken(2);
                 robots.put(robot.getRobotId(), robot);
             }
         }