fix collision
Merge branch 'master' of github.com:kruegsch/IGGJ7_Laika