Merge branch 'master' of https://github.com/bingoohuang/java-sandbox

Conflicts:
	README.md
merge readme