Major code refactoring and remaming  on combat form.
Major code refactoring and renaming.
Merge branch 'master' of https://github.com/TeamTamba-OOPTeamwork/Game