Merge branch 'master' into addmaps

src/Screen/ScreenPlayer.java

@@ -19,7 +19,7 @@ public class ScreenPlayer {
         //p = new Player(8, 15, "desert");
         p = new Player(4, 2, "21RI");
 
-        
+        b = new Battle(e);
 
         // Create both type of screen and record for reuse
         screenManager.registerScreen(ScreenMap.class);