still more collision detection fixes -_-
Merge branch 'master' of github.com:sh4ni/SFML_2D_Game