Conflicts:
	.gitignore
	src/libaevol/ae_dna.h
	src/libaevol/ae_dump.cpp
	src/libaevol/ae_exp_manager_X11.cpp
	src/libaevol/ae_genetic_unit.h
	src/libaevol/ae_individual.cpp
	src/libaevol/ae_individual.h
	src/libaevol/ae_string.h