3 version
4 version
5 version
5 version
6 version
Merge branch 'master' into iniesta

Conflicts:
	proyeMiguel2/bin/persona.class
	proyeMiguel2/src/persona.java