histograms on rocky
Merge branch 'master' of https://github.com/stymy/npairs

Conflicts:
	histogrammer.py
	variables.py