added roulette selection
merge
Merge branch 'dev'