Merge remote-tracking branch 'origin/sprint1-changes' into client

Author: TheApplePieGod

engine/src/main/battlecode/world/InternalRobot.java

@@ -555,6 +555,9 @@ private void addMessage(Message message) {
 
     public void sendMessage(InternalRobot robot, Message message) {
         robot.addMessage(message.copy());
+    }
+
+    public void incrementMessageCount() {
         this.sentMessagesCount++;
     }
 

engine/src/main/battlecode/world/RobotControllerImpl.java

@@ -1036,7 +1036,7 @@ public void sendMessage(MapLocation loc, int messageContent) throws GameActionEx
         assertCanSendMessage(loc, message);
         InternalRobot robot = this.gameWorld.getRobot(loc);
         this.robot.sendMessage(robot, message);
-        this.robot.incremenetMessageCount();
+        this.robot.incrementMessageCount();
         // this.gameWorld.getMatchMaker().addMessageAction(robot.getID(), messageContent);
     }
 
@@ -1080,7 +1080,7 @@ public void broadcastMessage(int messageContent) throws GameActionException{
                 this.robot.sendMessage(robot, message);
             }
         }
-        this.robot.incremenetMessageCount();
+        this.robot.incrementMessageCount();
     }
 
     // ***********************************