pavadas
Merge branch 'master' of https://github.com/tranfuga25s/inteligencia-

Conflicts:
	GTP2/Ej1/neuronaradial.cpp