prueba
Merge branch 'master' of https://github.com/maqueda/Baby-Educa.git

Conflicts:
	src/com/neurodigital/babyeduca/actores/Estrella.java