Colision Jugador
Merge commit 'd4a532d3b8fc5a5e29c2fb0bd6a414247330ceb8'