Update and rename Combat2.java to Combat.java