roll back
update
Merge branch 'master' of https://github.com/yanghaogn/Hadoop1

Conflicts:
	README.md