Fixed bullet/player collision
Merge branch 'master' of github.com:GraspSilv/1943project