Additional movement collision
Merge branch 'master' of https://github.com/Kruhlmann/Batman