change of function from main rep
Merge branch 'master' of github.com:Effessio/genetic

Conflicts:
	genetic.py