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

Conflicts:
	src/com/neurodigital/babyeduca/MainScreen.java