Merge remote-tracking branch 'upstream/master'
mapreduce readme added
Merge remote-tracking branch 'upstream/master'
mapreduce readme
cleaned file
cleaned

Conflicts:
	mapreduce/README.md
Merge pull request #9 from IguanaMeow/master

new