trainer handles his attacking
Merge remote-tracking branch 'origin/master'