readme
Merge branch 'master' of https://github.com/enilu/hadoopdoc

Conflicts:
	README.md