Fire fan working now
Merge remote-tracking branch 'origin/vipero-branch'
Updated with new battle ui
updated battle ui