commit in test brance, first
add in master branch, first
add in test2 brance, first
add in br test, 2
Merge branch 'test'

Conflicts:
	src/A.java
Merge branch 'master' of https://github.com/changer2000/chapter3.git

Conflicts:
	src/A.java