Added combat method prototype
Merge remote branch 'origin/master'