Make sure bullets collide with player
Merge
Merge branch 'develop' of github.com:werme/DATX02 into develop