Working on the battle screen.

Signed-off-by: Levi <levi.lirvat@niji.fr>
Merge branch 'master' of github.com:kowlown/gameandengine