debug code
Merge branch 'master' into wj_dev
Merge branch 'master' into wj_dev
add clientConfig
Merge branch 'master' into wj_dev

Conflicts:
	MapReduceAndDFS/src/example/WordCount.java
add client config
debug code
Merge branch 'master' into wj_dev

Conflicts:
	MapReduceAndDFS/src/example/WordCount.java