Merge branch 'master' of C:\Users\Yoset\Documents\Projectos Android\DroidList with conflicts.
Merge remote-tracking branch 'origin/master'
Nuevos Layouts

Se agrego el layout de asistencia.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	AndroidManifest.xml