Merge branch 'master' of /Users/Xandre/Desktop/AndroidStudio with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Icono launch y background del activity principal
background
Icono launch y background del activity principal!!!!!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	movil/MeYodaDemoProject/MeYodaDemo/src/main/java/com/talentum/meyodademo/Mazo.java