Fix collision.
Merge branch 'master' of https://github.com/Moe-/shootris