commit
Merge branch 'master' of https://github.com/TallerPandora/piqueteca

Conflicts:
	piqueteca/settings.py