"Se sube el modelo"
Resolviendo problema con merge
Merge branch 'federicoferri6' of github.com:FrankLabs/Entrax into federicoferri6

Conflicts:
	src/apps/championship/models.py