Changed Combat Class

removed combat class and added the methods to Hero/Mob class, also
modified the main func to reflect changes to classes.