Merge origin/master

Conflicts:
	DemoArticuloLunes/src/demoarticulolunes/Negocio/NumeroNatural.java
	DemoArticuloLunes/src/demoarticulolunes/Presentacion/FormularioPrincipal.form
	DemoArticuloLunes/src/demoarticulolunes/Presentacion/FormularioPrincipal.java
Merge origin/master

Conflicts:
	DemoArticuloLunes/src/demoarticulolunes/Negocio/NumeroNatural.java
	DemoArticuloLunes/src/demoarticulolunes/Presentacion/FormularioPrincipal.form
	DemoArticuloLunes/src/demoarticulolunes/Presentacion/FormularioPrincipal.java
Merge origin/master

Conflicts:
	DemoArticuloLunes/src/demoarticulolunes/Negocio/NumeroNatural.java
	DemoArticuloLunes/src/demoarticulolunes/Presentacion/FormularioPrincipal.form
	DemoArticuloLunes/src/demoarticulolunes/Presentacion/FormularioPrincipal.java