Working on Ending battles

Working on Ending battles
Merge remote-tracking branch 'upstream/master'
Merge pull request #8 from heorohuy/master

Working on Ending battles