Trying new combinations
Some modifs
Merge branch 'testing'

Conflicts:
	src/genetic.m
	src/util.m
ii