home do site
Merge branch 'master' of https://github.com/pegapega/pegapega

Conflicts:
	partidas/templates/partidas/list.html
	partidas/urls.py