conflict
Merge branch 'master' of https://github.com/LeVirus/Prog-genetic
bvqiubvijdze;SZASKBSZENvrbf: