Fixing some things.
Merge branch 'master' of https://github.com/esm8m/FireEmblemAI
Fixing conflicts part 1