develop: edit B
master 1
develop: 1
Merge branch 'develop'

Conflicts:
	src/test/A.java