Signed-off-by: jimgz
Merge branch 'master' of git@github.com:wanjiastar/testRepo.git

Conflicts:
	src/hello/Hello.java