asadf

dsasda
Merge branch 'master' of https://github.com/janfranco27/TheProyect

Conflicts:
	ManagerM/Makefile
	ManagerM/Makefile.Debug
	ManagerM/Makefile.Release
	ManagerM/ManagerM.pro
	ManagerM/ManagerM.pro.user
	ManagerM/debug/ManagerM.exe
	ManagerM/debug/moc_ui_edit_articulo.cpp
	ManagerM/debug/moc_ui_edit_proveedor.cpp
	ManagerM/debug/moc_ui_login.cpp
	ManagerM/debug/moc_ui_module_articulos.cpp
	ManagerM/debug/moc_ui_module_clientes.cpp
	ManagerM/debug/moc_ui_module_colaboradores.cpp
	ManagerM/debug/moc_ui_module_compras.cpp
	ManagerM/debug/moc_ui_module_home.cpp
	ManagerM/debug/moc_ui_module_ventas.cpp
	ManagerM/debug/moc_ui_new_marca.cpp
	ManagerM/debug/moc_ui_new_medida.cpp
	ManagerM/debug/moc_ui_new_orden.cpp
	ManagerM/debug/moc_ui_new_proveedor.cpp
	ManagerM/debug/moc_ui_new_transportista.cpp
	ManagerM/debug/moc_ui_newedit_cliente.cpp
	ManagerM/debug/moc_ui_newedit_colaborador.cpp
	ManagerM/debug/moc_ui_opciones.cpp
	ManagerM/debug/moc_ui_opciones_articulo.cpp
	ManagerM/debug/moc_ui_opciones_banco.cpp
	ManagerM/debug/moc_ui_opciones_base_datos.cpp
	ManagerM/debug/moc_ui_opciones_comprobante.cpp
	ManagerM/debug/moc_ui_opciones_general.cpp
	ManagerM/debug/moc_ui_opciones_proveedor.cpp
	ManagerM/debug/moc_ui_opciones_tienda.cpp
	ManagerM/debug/moc_ui_tool_bar.cpp
	ManagerM/managerm.log
	ManagerM/object_script.ManagerM.Debug
	ManagerM/object_script.ManagerM.Release
	ManagerM/share_include.h
	ManagerM/ui_ui_opciones_comprobante.h