Merge branch 'rage' of https://github.com/ElizaAlex/pokerogue into rage

# Conflicts:
#	src/test/moves/rage.test.ts

src/test/moves/rage.test.ts

@@ -197,7 +197,7 @@ describe("Moves - Rage", () => {
       await game.toNextTurn();
       expect(leadPokemon.summonData.battleStats[BattleStat.ATK]).toBe(1);
       expect(leadPokemon.getTag(RageTag)).toBeTruthy;
-    },TIMEOUT
+    },90000
   );
 
   /**