EDIT b.java
Merge branch 'master' of https://github.com/liuyajun52/Test

Conflicts:
	a.java
	b.java