updated histdata.py
Merge branch 'b2'

Conflicts:
	histdata.py