Added initial logic for animating fighting
Merge remote-tracking branch 'origin/master'