Updated Combat class functions

1. Slight implementation on the combat class functions
2. Please review codebase and comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	Taken/Combat/Combat.cs