Commit in Release
Merge branch 'release/myRelease.0' into develop
Commit in release v1
Merge branch 'release/myRelease.1' into develop
Correccion en bug1.0
Merge branch 'hotfix/bug1.0' into support/v1
Merge branch 'prueba' into develop

Conflicts:
	Main.java