Nuevas Pantallas
Merge remote-tracking branch 'origin/master'

Conflicts:
	karolina.suo
	karolina/Form1.vb
	karolina/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	karolina/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache