mas informe
Merge branch 'master' of https://github.com/dariosus/ITBA_SIA_13_GeneticAlgorithms

Conflicts:
	doc/anexo.mkd
Merge branch 'master' of https://github.com/dariosus/ITBA_SIA_13_GeneticAlgorithms
Primer tabla del informe
Merge branch 'master' of https://github.com/dariosus/ITBA_SIA_13_GeneticAlgorithms