first commit user 1/ add inituser1()
xMerge branch 'test1'

Conflicts:
	test1.java
add test2.java