bla2
Merge branch 'master' of https://github.com/AlexiaTorres/pruebaclase

Conflicts:
	README.md