Merge pull request #1 from mayralizarraga/master

first commit - mayra
nada
Merge pull request #3 from buelna/master

el buelna se la come merge
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
cambios antes de pull upstream
Merge branch 'master' of https://github.com/Sealtyel/Testing