Updates

EVERYWHERE :D
Merge branch 'master' into Colin-Dev
changed fighter names