added rough cat attack animation
fixed merge conflicts