Merge branch 'master' of C:\Users\Lautaro\AndroidStudioProjects\tareaMobile with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_principal.xml
Arreglando un poco las vistas
Va lo ultimo