Merge pull request #127 from nolanfilter/Nolan

Fixed death animations
no message
Merge pull request #128 from nolanfilter/JimmyJam

no message