wolf + trap collison fix
Merge branch 'master' of https://github.com/jimmiebergmann/LD28