mersh p2 local
Merge branch 'master' of https://github.com/gcorreageek/proyDAW2

Conflicts:
	proyAdminCotizaciones/bd/script_bd.sql