modif fct quantification
Merge branch 'master' of https://github.com/Warrows/algo

Conflicts:
	inc/histo.h