algoritmo sencillo de batalla: todos contra todos
merge master into this branch
units cannot attack all other units, restrictions added
merge conflicts resolved
Merge branch 'fanky'