6. Crear la rama release-1.0: realizar 1 cambio y un 1 commit
estable_1
estable_2
Merge branch 'release-1.0' into develop

Conflicts:
	src/EGit/ClaseEgit.java