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

Conflicts:
	main.m
Merge branch 'master' of github.com:mdesanti/SIA-TP2
Merge branch 'master' of github.com:mdesanti/SIA-TP2
Merge branch 'master' of github.com:mdesanti/SIA-TP2
Training goes on until all tests pass (should)
Merge branch 'master' of github.com:mdesanti/SIA-TP2