Them TIME
Merge branch 'master' of https://github.com/tritmt/xulyphanbo

# By fire1991man (4) and Nguyen Vinh Loc (3)
# Via fire1991man
* 'master' of https://github.com/tritmt/xulyphanbo:
  update
  update
  -Update fire and battle
  -Update
  -Update crash bug
  update
  huy