add in br test_br_again, 1
Merge branch 'test_br_again'
add in master, 1
add in br test_br_again, 2
Merge branch 'test_br_again'

Conflicts:
	src/A.java
add in br test, 3
Merge branch 'master' into test

Conflicts:
	src/A.java