my six
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestGit/src/com/hello/git/Hello2.java