test commit
Merge branch 'master' of github.com:kenwjj/MReduce

Conflicts:
	.gitignore
test commit