Nuevas pendientes
Merge branch 'master' of https://github.com/plandevida/Practica4-TP.git

Conflicts:
	resources/configuracion/carrera
	src/sistema/factoresexternos/Pendiolo.java