consulta
Merge branch 'master' of https://github.com/carojasq/Tienda_Virtual_DB1

Conflicts:
	server.py
info producto
info producto