tes
Merge remote-tracking branch 'origin/RemoteRuns/Soto'

Conflicts:
	MvcMainApplication/MvcMainApplication.Tests/TestControllerTest.cs
Merge branch 'RemoteRuns/Soto'

Conflicts:
	MvcMainApplication/MvcMainApplication.Tests/TestControllerTest.cs
1
Merge branch 'master' into RemoteRuns/Soto
Merge try