Delete obj/histo.o
Merge branch 'master' of https://github.com/Warrows/algo
confirmation de 2.1 et 2.2 au sujet
Merge remote-tracking branch 'origin/master'

Conflicts:
	obj/histo.o