Don't rearrange team after battle has begun.
Merge branch 'master' of github.com:sarenji/battletower