Merge branch 'master' into Tarea1

Conflicts:
	tareas.pdf