Changes in War and WarCW

Removal of “war” method in War class, changed functionality to work
better with WarCW