h bk
Merge branch 'tmp'

Conflicts:
	hist.txt
after merge