Added method for counting friends and enemies
Merge remote-tracking branch 'origin/master'