s
Merge branch 'master' of github.com:Eagles2F/MapReduceAndDFS

Conflicts:
	MapReduceAndDFS/src/mapreduce/Mapper.java