vista de las cartas
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	movil/MeYodaDemoProject/MeYodaDemo/src/main/res/layout/mostrar_carta.xml
actualizacion objetos
Merge remote-tracking branch 'origin/master'