Fixed a problem of having to put an extra input when ending a battle.

Now ends immediately after a battle.
Merge remote-tracking branch 'origin/master' into adrian