b
Merge branch 'master' of https://github.com/jtxd/test2.git

Conflicts:
	src/A.java