test
Merge branch 'master' of github.com:aamend/hadoop-scripts

Conflicts:
	README
Add README file