local
Merge branch 'master' of https://github.com/araujoysegovia/liderplayer
vista duelos tiempo real
fix conflicts