…randtest_to_test

# Conflicts:
#	CMakeLists.txt

# Conflicts:
#	test/CMakeLists.txt

…re/rework_settings

# Conflicts:
#	examples/ex1.C
#	examples/ex2.C
#	examples/ex3.C
#	examples/ex4.C
#	examples/ex7.C
#	examples/ex9.C
#	test/CMakeLists.txt
#	test/GAExamplesTest.cpp
#	test/GASimpleGATest.cpp

# Conflicts:
#	examples/ex13.C
#	examples/ex22.C
#	examples/ex24.C
#	examples/ex27.C
#	ga/GAParameter.C

…ings

…ork_settings

# Conflicts:
#	examples/ex27.C
#	ga/GABaseGA.C
#	ga/GAParameter.C
#	ga/GASStateGA.C
#	ga/GASimpleGA.C
#	ga/GAStatistics.C

…/galib into feature/rework_settings

# Conflicts:
#	examples/ex27.C
#	ga/GABinStr.h
#	ga/GAParameter.C
#	ga/GAStatistics.C