Changes in Juego-Jugador
Resolve conflicts
Merge branch 'master' of https://github.com/lbonilla/Premier.Mejengas