fix
fix
Merge branch 'master' of https://github.com/zouhc/MyHadoop

Conflicts:
	.gitignore
	utils/hadoop-ext/src/main/java/cn/uc/hadoop/utils/TextUtils.java