Merge branch 'develop'
Bug2.0 fixed
Merge branch 'hotfix/bug2.0'
commit prueba
Merge branch 'release/bug_prueba/v2' of https://github.com/MyOrganizatio/MyRepo into release/bug_prueba/v2

Conflicts:
	Main.java
Merge branch 'release/bug_prueba/v2'

Conflicts:
	Main.java
pruebita Release
Merge branch 'release/prueba1'
Merge tag 'prueba1' into develop

ok
prueba mas
Merge branch 'release/bug_prueba/v2'
Merge tag 'bug_prueba/v2' into develop

finish prueba