Cambio 1 - rama rama1
Cambio 2 - rama rama1
Merge branch 'rama1' of git@github.com:festradasolano/enf2tm.git into
rama1

Conflicts:
	test/src/test/Test.java
Cambio 3 - rama rama1
Cambio 4 - rama rama1
Merge branch 'rama1'