cambio string- mayra
Merge branch 'master' of https://github.com/mayralizarraga/testing into mayralizarraga-master
Merge branch 'mayralizarraga-master'
merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/strings.xml