BasicAttacks fixed

Aslo still working on fighter/FighterPool
Merge branch 'master' into Colin-Dev