second commit
second merge
Merge branch 'trunk' of https://xhui@github.com/xhui/Practice_J2SE.git
into trunk/TWI-002

Conflicts:
	Practice_J2SE/test.txt