Prueba repo 3 commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	adenunciar/res/values/strings.xml
Merge remote-tracking branch 'origin/master'