new try to sync
Merge branch 'master' of https://github.com/jsantoul/ga

Conflicts:
	src/lib/cohorte.py
	src/scripts/test_ga.py