Merge pull request #25 from sli-fox/jeremy

Jeremy
Changed animation handler and BlackCat
Merge pull request #26 from sli-fox/marky_branch

Changed animation handler and BlackCat
Fixed Waypoints
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch
Merge pull request #27 from sli-fox/marky_branch

Marky branch
fixing crash on play button