con update sin perzonalizar
Basura borrada
Merge branch 'master' of https://github.com/DanielGandarillas/n-lace

Conflicts:
	productos/admin.pyc
	productos/forms.pyc
	productos/models.pyc
	productos/urls.pyc
	productos/views.pyc