plo plo
Merge branch 'master' of github.com:gmljosea/IA2

Conflicts:
	Tarea1/grafica_cprueba.m