changes
another changes
Merge branch 'alexis'

Conflicts:
	Studiapp
	app/build/intermediates/res/debug/layout/tareas_activity.xml
shit project