B branch second commit test
Merge branch 'B'

Conflicts:
	circle.py