bb2
Merge branch 'b2b2' of https://github.com/rostag/history

Conflicts:
	README.md