java update
Merge branch 'master' of https://github.com/jgmao/CodingStudy

Conflicts:
	src/UglyNumber.cpp