Text scrolling now implemented for battle

pressing z will immediately draw all the text, while waiting slowly
draws all the text image.
Merge branch 'master' of https://github.com/Chibin/The-Circle
Merge remote-tracking branch 'origin/master' into JuanBranch