A branch second commit test
Merge branch 'A'

Conflicts:
	circle.py