commit5
Merge branch 'test1' of https://github.com/howardhe0329/git_demo/ into
test1

Conflicts:
	src/com/howard/git/HelloWorld.java