Added FighterCollection class
Refactor on Combat class