Jorge
Jorge
Merge branch 'master' of https://github.com/jorgegonzac/PDVenta

Conflicts:
	PDVenta.v11.suo
	PDVenta/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PDVenta/obj/Debug/PDVenta.csproj.FileListAbsolute.txt