dimitri no centro
Merge branch 'master' of github.com:pegapega/pegapega

Conflicts:
	partidas/templates/partidas/win.html