Fixing some things
Merge branch 'master' of github.com:mdesanti/SIA-TP2

Conflicts:
	src/genetic.m