first commit
Merge https://github.com/Neo-J/Battle