Resolviendo
Merge branch 'master' of github.com:Mario-chess/recetario_mario

Conflicts:
	manage.py
	principal/models.pyc
	recetario_mario.db