delete_histo up
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/histo.c

delete_histo
Merge branch 'master' of https://github.com/Warrows/algo
delete_histo