Force Commit
Merge branch 'master' of https://github.com/InventarioPaloquemao/PaloquemaoACM
Commit Sync
Conflicts:
	PaloquemaoAMC/PruebasDesign/PaloquemaoACM.v11.suo
	PaloquemaoAMC/PruebasDesign/PruebasDesign/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PaloquemaoAMC/PruebasDesign/PruebasDesign/obj/Debug/PaloquemaoACM.csproj.FileListAbsolute.txt