1
Merge branch 'master' of https://github.com/shenzhang/study

Conflicts:
	hadoop/src/main/java/HadoopMain.java
	jdk/pom.xml