ok
Merge branch 'master' of https://github.com/IsidroAguilar/AplicacionEmpresarialFinal

Conflicts:
	FinalAppEmpresarial.v12.suo