Merge branch 'master' into public-release

Author: TheApplePieGod

client/src/constants.ts

@@ -1,4 +1,4 @@
-export const CLIENT_VERSION = '1.3.3'
+export const CLIENT_VERSION = '1.4.0'
 export const SPEC_VERSION = '1'
 export const BATTLECODE_YEAR: number = 2025
 export const MAP_SIZE_RANGE = {

engine/src/main/battlecode/common/GameConstants.java

@@ -80,7 +80,7 @@ public class GameConstants {
     public static final int PENALTY_NEUTRAL_TERRITORY = 1;
 
     /** The amount of money each team starts with. */
-    public static final int INITIAL_TEAM_MONEY = 1000;
+    public static final int INITIAL_TEAM_MONEY = 2500;
 
     /** The percent of the map which a team needs to paint to win. */
     public static final int PAINT_PERCENT_TO_WIN = 70;