a

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

Conflicts:
	ClinicAdminCR/res/layout/login.xml