asd
asd
asd
asd
Merge remote-tracking branch 'origin/branch1' into branch1
asd
Merge branch 'master' of https://github.com/julentv/Prueba.git into
branch1

Conflicts:
	Prueba/src/Clase2.java