Add b4
Modify b4
Merge branch 'b4'

Conflicts:
	test2.py