Trying CMAES, doesn't work.
Merge with tisu
Merge origin/master

Conflicts:
	main.cpp