Sin algun cambio
Merge branch 'master' of https://github.com/JefferDev/InventarioA-MVC

Conflicts:
	InventarioA-MVC/InventarioA_MVC/Controllers/InicioController.cs