ssss

ss
ssss

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

Conflicts:
	TesisProj/Areas/Simulaciones/Controllers/NormalController.cs
	TesisProj/Areas/Simulaciones/Views/Normal/Index.cshtml