Merge branch 'master' of https://github.com/iggi-phd/essex-aihack

.idea/vcs.xml

@@ -3,4 +3,5 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
\ No newline at end of file
+</project>
+

src/battle/SimpleBattle.java

@@ -55,6 +55,10 @@ public class SimpleBattle {
         }
     }
 
+    public int getTicks() {
+        return currentTick;
+    }
+
     public int playGame(BattleController p1, BattleController p2) {
         this.p1 = p1;
         this.p2 = p2;