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

Conflicts:
	src/histo.c