b1 b1
bbb3
b1 b1 b1
Merge branch 'bbb3' of https://github.com/rostag/history into b1b1

Conflicts:
	README.md
Merge branch 'b2' of https://github.com/rostag/history into develop

Conflicts:
	README.md
Merge branch 'b1b1' of https://github.com/rostag/history into develop
Merge branch 'b2b2' of https://github.com/rostag/history

Conflicts:
	README.md
Merge branch 'master' of https://github.com/rostag/history into develop

Conflicts:
	README.md
bb2