string.xml
Merge branch 'master' of https://github.com/Alebmurillo/TP1-Moviles

Conflicts:
	ClinicAppCR/res/values/strings.xml