merge
Merge branch 'master' of https://github.com/araujoysegovia/liderplayer
merge
Fix confilcts
Fix conflicts
Ruta de duelos, vista de duelos