King Shield Fix
Merge pull request #803 from Fuzzysqurl/KS

King Shield Fix
Merge remote-tracking branch 'origin/master' into battles
Battling from beginning to start works