normal
Merge branch 'master' of https://github.com/miguelavg/TesisProj

Conflicts:
	TesisProj/Areas/Simulaciones/Views/MaestroSimulacion/Index.cshtml
normal