cambios menores
cambios menores
cambios menores
Merge branch 'master' into javier

Conflicts:
	compras.db
	view_ventana_principal.py
Merge branch 'master' of https://github.com/javierperezferrada/tarea_final_taller