first commit
Merge https://github.com/leezsi/concur-battle