Merge Histogram Classes
Merge branch 'master' of github.com:hewenbin/itl_remake

Conflicts:
	src/CMakeLists.txt