collision detection improvements
Merge branch 'master' of github.com:sh4ni/SFML_2D_Game

Conflicts:
	Visual_Studio/game/player.cpp
	Visual_Studio/game/player.h