Pull
Merge branch 'master' of https://github.com/Theophilus/mapred

Conflicts:
	mapred