m commit
c
bug
Merge branch 'b_1'

Conflicts:
	GitDemo/src/com/main/Test.java
c