https://gitlab.fing.edu.uy/santiago.vaiga/TProg.git into main

Conflicts:
	src/Manejadores/ManejadorActividad.java