Correction taille separateur
Structuration, correction declaration variable, fautes
Merge branch 'master' of https://github.com/Zuliz/InferenceHaplotypes

Conflicts:
	fonctions.h