Merge
Merge pull request #24 from NamTThai/merge-battle-log-and-animation

Merge