added battle api
Modify .gitignore
TH-9 | merge conflicts
Remove gitignore for modification
Added git ignore
TH-1 | Modify file path
Merge remote-tracking branch 'origin/dev1.0' into dev1.0
TH-6 | Added logs functions, fix conflict
fix users model