kinda working
Merge branch 'master' of github.com:mdesanti/SIA-TP2

Conflicts:
	neuralNetwork.m