wrong to right
merge test
Merge remote-tracking branch 'origin/master'

Conflicts:
	gitone/src/com/example/Test.java